Should we change code in `persistAndFlush()` and use it here? IMO yes.