Fix population of cache at startup