Caching cleanup + tests