merge with master and use getContextPopulateCache for backwards compat