Caching implementation & view tweaks