Thanks, I have gone with your first suggestion for a work around because I already had the ItemEntity fetched in the same session for a different reason. It seems to work as expected now. I do have other indexed types, but they are structured quite differently and don’t seem to be affected in the same way, so I use this workaround for them.

If you want to answer the SO question, I will accept it.