Don't cause leak exception checking for retry
Switch to context holding adapters instead of wrap/delegation