diff --git a/core/modules/file/src/FileAccessControlHandler.php b/core/modules/file/src/FileAccessControlHandler.php
index 2193f92..2561198 100644
--- a/core/modules/file/src/FileAccessControlHandler.php
+++ b/core/modules/file/src/FileAccessControlHandler.php
@@ -55,9 +55,9 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
       // Only the file owner or user with 'administer files' permission can
       // delete and update the file entity.
       if ($account->id() === $file_uid[0]['target_id'] || $account->hasPermission('administer files')) {
-        return AccessResult::allowed();
+        return AccessResult::allowed()->addCacheableDependency($entity);
       }
-      return AccessResult::forbidden();
+      return AccessResult::forbidden()->addCacheableDependency($entity);
     }
 
     // No opinion.
diff --git a/core/modules/rest/tests/src/Functional/BcTimestampNormalizerUnixTestTrait.php b/core/modules/rest/tests/src/Functional/BcTimestampNormalizerUnixTestTrait.php
index a275f64..b7717c0 100644
--- a/core/modules/rest/tests/src/Functional/BcTimestampNormalizerUnixTestTrait.php
+++ b/core/modules/rest/tests/src/Functional/BcTimestampNormalizerUnixTestTrait.php
@@ -24,7 +24,7 @@
   protected function formatExpectedTimestampItemValues($timestamp) {
     // If the setting is enabled, just return the timestamp as-is now.
     if ($this->config('serialization.settings')->get('bc_timestamp_normalizer_unix')) {
-      return ['value' => $timestamp];
+      return ['value' => (int) $timestamp];
     }
 
     // Otherwise, format the date string to the same that
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php
index ef97646..4093c05 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php
@@ -3,11 +3,14 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\File;
 
 use Drupal\file\Entity\File;
+use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\user\Entity\User;
 
 abstract class FileResourceTestBase extends EntityResourceTestBase {
 
+  use BcTimestampNormalizerUnixTestTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -78,14 +81,10 @@ protected function createEntity() {
   protected function getExpectedNormalizedEntity() {
     return [
       'changed' => [
-        [
-          'value' => $this->entity->getChangedTime(),
-        ],
+        $this->formatExpectedTimestampItemValues($this->entity->getChangedTime()),
       ],
       'created' => [
-        [
-          'value' => (int) $this->entity->getCreatedTime(),
-        ],
+        $this->formatExpectedTimestampItemValues($this->entity->getCreatedTime()),
       ],
       'fid' => [
         [