Merged in branch 25417_configurable_cache_location