Merge "Add a singleton CacheLocation to replace the hard coded locations"