Corrected fallback
A bit of refactoring
Exposed cache url functions