Merge "Population Density Provider: add cache hint" into main