Merge "Handle user-defined cache path for RS."