Currently, the DefaultSocketProvider has diverged a bit from the default SyncSocketProvider interface and is using a reference to DefaultSocketProvider instead of the interface. Update ClientImpl to use a reference to the interface and check to see if a custom implementation has been passed in to determine if a custom or the default socket provider should be used.