[caching] More work on Invalidate tests