We need to update the cache isolation tests to use the new cache2 APIs and to account for legacy/trac#15933. Patch coming soon.