Refactor dispatcher to no longer handle serving the response as well as dispatching it