More little caching changes.