Merge "Add retries for base client" into mcp/caracal