fix: #3474843 Loading entity during save will cache old version

Closes #3474843

Merge request reports

Loading