Caching cleanup