Tweaked caching back to the way it was.