IN-244 bring back the retry mechanism that it had and make it an interface so the user can easily swap in and out