Improved validation mechanism

Previously a seperate http.RoundTripper was used, now using the
provided upstream handler.