Make proxy somewhat provider-agnostic