refactoring of cache storages