CacheManager: Cleaning performance improvements