Yet more caching cleanup