Fixes cache prepopulation at start up time