Cache tests: Make it easier to test many caches

Some rearranging to make it easier to write tests that assert on the
output of multiple caches.