Add support for per-request headers

r? @metcalf