Trying to make our http client plugin more reliable