Minor performance updates related to caching.