reverse CachedStorage logic for performance reasons