Improvements to cache population.