Fix PrepareAwareInterface sideEffects
relative to #3818