Merge "Rename CacheLocation to Paths."