CLC-3484 Reorder cache warming
Merge pull request #2290 from ctweney/clc-3484

CLC-3484 Reorder cache warming