diff --git a/core/modules/user/src/Controller/UserController.php b/core/modules/user/src/Controller/UserController.php
index 5fd875d..21c81a2 100644
--- a/core/modules/user/src/Controller/UserController.php
+++ b/core/modules/user/src/Controller/UserController.php
@@ -173,9 +173,7 @@ public function userTitle(UserInterface $user = NULL) {
    */
   public function logout() {
     user_logout();
-    $response = $this->redirect('<front>');
-    $response->getCacheableMetadata()->setCacheMaxAge(0);
-    return $response;
+    return $this->redirect('<front>');
   }
 
   /**
diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml
index 6eb709f..8c00c45 100644
--- a/core/modules/user/user.routing.yml
+++ b/core/modules/user/user.routing.yml
@@ -12,6 +12,8 @@ user.logout:
     _controller: '\Drupal\user\Controller\UserController::logout'
   requirements:
     _user_is_logged_in: 'TRUE'
+  options:
+    no_cache: TRUE
 
 user.admin_index:
   path: '/admin/config/people'