CacheStore adding some changes in code