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