And in the hibernate listeners, there’s no way to switch the entity instance to the non-proxy one… So, I couldn’t quickly think in a way to avoid spreading unproxy all over the place in our cases.