UPDATED CacheService