Renamed more stuff in CacheLoader/CacheLoaderBase