More caching cleanup