ISPN-3276 More work on CacheStores