Merge pull request #19076 from seamuslee001/update_cache_integration_tests