Option #6/2: fix: #3474843 Loading entity during save will cache old version

Claudiu Cristearequested to merge
issue/drupal-3474843:3474843-entity-cache-tombstones into main

Closes #3474843

Merge request reports