backport of 4.3 setting caching fixes