Tentatively turning on test-id caching