Improvements in CacheManager