Cleaning up the saga persistence behavior now that we have access to the
handler and message via the context