issue #20888: Fix cached model changes that are discarded.
Merge pull request #832 from jrogelstad/20888

issue #20888: Fix cached model changes that are discarded.