tweaks to cache prepopulation for tests