Better recovery for PersistentConsumer