Hi Steve,
Glad to hear from you again after so long time & thanks for commenting this.
Can you please take a look at https://github.com/hibernate/hibernate-orm/pull/6515 .
I think it contains a neat solution and test-case.
(It still removes the natural-id entry from the natural-id Session (first level) cache anyway)
best regards
Guenther