[caching] Some more work on InvalidationTests