diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index e1c9c65..8c52221 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -231,9 +231,9 @@ function book_form_update($form, $form_state) {
 }
 
 /**
- * Implements hook_node_load_uncached().
+ * Implements hook_node_load().
  */
-function book_node_load_uncached($nodes) {
+function book_node_load($nodes) {
   /** @var \Drupal\book\BookManagerInterface $book_manager */
   $book_manager = \Drupal::service('book.manager');
   $links = $book_manager->loadBookLinks(array_keys($nodes), FALSE);
diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
index 41358a6..3fca8ee 100644
--- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
@@ -157,7 +157,8 @@ public function testCreate() {
     $field_info = $this->getMockBuilder('\Drupal\field\FieldInfo')
       ->disableOriginalConstructor()
       ->getMock();
-    $entity_storage = new ContentEntityDatabaseStorage($entity_type, $connection, $field_info);
+    $cache = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
+    $entity_storage = new ContentEntityDatabaseStorage($entity_type, $connection, $field_info, $cache);
 
     $entity = $entity_storage->create();
     $entity->expects($this->atLeastOnce())