cache prepopulation fixed