Revert changes for attempts after retry, rename registration cache in Client to avoid confusion with the registration module