Tweaks to dimension caching based on feedback from Chris.