PIM-3325 : re-work persisters