Dev

Caching everywhere