Remove the dependency on HttpServletRequest