Move setting matched route / handler on the response object so we don't have to dig for it twice
Update to use new methods on response object, more performance