reverse CachedStorage logic for performance reasons
minor fix
minor fix #2
refactored CachedAzureStorage