Could we return a client that already has getTokenFromRequest so that this is easier to follow?