[SW] Bug 940273 Refactor into CacheStorageManager singleton.