Inject headers in response creation

A little simpler than creating the response and calling addHeaders