Fix a problem with deprected HttpMessageHandler interface. Next step is to remove it.