[caching] InvalidationTests fixes