Fix correctFolders and retrieve the correct storage cache