Improvements to cache population.
Merge pull request #397 from NICTA/populateCacheImprovements

Improvements to cache population.