* Undid changes to CacheManager