Continued misc caching groundwork.