UNDERTOW-172 deal with wrapped requests correctly