Rearrange functions
Tweak naming
Merge cache.sh into storage.sh