[1234] Fix API key slowness problem.