Remove api_retry, fix wrap_retry

[earonesty]

Integration tests can be flaky with providers requiring "retry", or disconnects, etc.

Tests now have 2 mechanisms for retrying... a "wrap_retry" around provider methods and an "api_retry".

The api function is not really guaranteed to be something we can catch (some use it as a with block for exception handling, others use it functionally, the mock just calls it to pass tests). It should be removed.