Undo with rendered viewport

Hello,

It’s really annoying that, with the rendered viewport, when doing an undo, even if it’s just undoing a “move node”, Blender freezes (if you have a rather big scene like mine) and rebuilds the BVH to re-render the viewport.

Is there any wait to avoid that? Tried cache BVH but that didn’t help (and it fills up my HDD very quickly).

Thanks