Backport of new cache fields policy for 1.1.x