Remove dependence on request.uri in dispatcher