Improve fixtures so that we can better test cache