Add a couple more performance caching enhancements.
More performance fixes