Merge pull request #1584 from Benglin/master

Build fix: NodeModel.OldValue was renamed to CachedValue