Cleaning up some of the caching code for rtm