Reveal a little bit more detail about what we cache (#858)