Change the property value update semantics to more closely match the previous state before the refactoring.  Specifically, values are cached in a single map of key to final resolved values.