CLC-3484 Reorder cache warming

https://jira.ets.berkeley.edu/jira/browse/CLC-3484