Some more renaming in CacheLoaderBase