Cleanup test failures from #4124.

#4124 merged cleanly, and tests passed at the time, but the recent changes to using an internal cache for these checks broke the PR.

This just cleans it up and fixes the tests.