core/lib/Drupal/Core/Cache/DatabaseBackendFactory.php             | 3 +--
 core/tests/Drupal/Tests/Core/Cache/DatabaseBackendFactoryTest.php | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackendFactory.php b/core/lib/Drupal/Core/Cache/DatabaseBackendFactory.php
index 67807ec..c610a77 100644
--- a/core/lib/Drupal/Core/Cache/DatabaseBackendFactory.php
+++ b/core/lib/Drupal/Core/Cache/DatabaseBackendFactory.php
@@ -65,8 +65,7 @@ public function get($bin) {
     }
     else {
       // Fall back to the default max rows if nothing else is configured.
-      // @todo Bikeshed the max rows default.
-      $max_rows = 1000;
+      $max_rows = 10000;
     }
     return new DatabaseBackend($this->connection, $this->checksumProvider, $bin, $max_rows);
   }
diff --git a/core/tests/Drupal/Tests/Core/Cache/DatabaseBackendFactoryTest.php b/core/tests/Drupal/Tests/Core/Cache/DatabaseBackendFactoryTest.php
index 30ebebe..f609ff1 100644
--- a/core/tests/Drupal/Tests/Core/Cache/DatabaseBackendFactoryTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/DatabaseBackendFactoryTest.php
@@ -34,8 +34,8 @@ public function getProvider() {
     return [
       'default' => [
         [],
-        1000,
-        1000,
+        10000,
+        10000,
       ],
       'default overridden' => [
         [
@@ -55,7 +55,7 @@ public function getProvider() {
           ],
         ],
         13,
-        1000,
+        10000,
       ],
       'default + bar bin overridden' => [
         [
@@ -65,7 +65,7 @@ public function getProvider() {
             ],
           ],
         ],
-        1000,
+        10000,
         13,
       ],
       'default overridden + bar bin overridden' => [