fixes in CacheService