Calm (Credits to Maxime Dantec)
Fix client-side cache
Factor out cache code