Minor caching cleanup.