Refactoring of StorageManager and CacheManager initialization