I guess perhaps the right strategy is to refactor the test then and leave the caching as it was. I'll do that.