Update retry task to not rely on automatic forwarding of events.