update cache isolation tests to use cache2 API

We need to update the cache isolation tests to use the new cache2 APIs and to account for #15933 (moved). Patch coming soon.