WIP: tidy up a couple of the cache stats, still more to understand and fixup.