Add request wrapper to force JSON parsing if possible on response body
Remove customized request wrapper
Update type check to simple inclusion