Michael Strelan
--- a/core/modules/media/src/MediaAccessControlHandler.php
+++ b/core/modules/media/src/MediaAccessControlHandler.php
-          $access_result = AccessResult::allowedIf($is_owner)
-            ->cachePerPermissions()
-            ->cachePerUser()
-            ->addCacheableDependency($entity);
-          if (!$access_result->isAllowed()) {
-            $access_result->setReason("The user must be the owner and the 'view own unpublished media' permission is required when the media item is unpublished.");
-          }
-        }
-        else {
-          $access_result = AccessResult::neutral()
-            ->cachePerPermissions()
-            ->addCacheableDependency($entity)
-            ->setReason("The user must be the owner and the 'view own unpublished media' permission is required when the media item is unpublished.");
+
+        $access_result = AccessResult::allowedIf($is_owner && $account->hasPermission('view own unpublished media'))
+          ->cachePerPermissions()
--- a/core/modules/media/src/MediaAccessControlHandler.php
+++ b/core/modules/media/src/MediaAccessControlHandler.php
          return AccessResult::allowed()->cachePerPermissions();
        }
-        if ($account->hasPermission('update media') && $is_owner) {
-          return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity);
-        }
-        return AccessResult::neutral("The following permissions are required: 'update any media' OR 'update own media' OR '$type: edit any media' OR '$type: edit own media'.")->cachePerPermissions();
-
-      case 'delete':
-        if ($account->hasPermission('delete any ' . $type . ' media')) {
+        if ($account->hasPermission('edit any ' . $type . ' media')) {
          return AccessResult::allowed()->cachePerPermissions();
        }
-        if ($account->hasPermission('delete own ' . $type . ' media') && $is_owner) {
-          return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity);
+        if ($is_owner && ($account->hasPermission('edit own ' . $type . ' media') || $account->hasPermission('update media'))) {
+          return AccessResult::allowed()->cachePerPermissions()->cachePerUser();
--- a/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
+++ b/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php

    // 200 for well-formed HEAD request.
    $response = $this->request('HEAD', $url, $request_options);
-    // MISS or UNCACHEABLE depends on data. It must not be HIT.
-    $dynamic_cache = !empty(array_intersect(['user', 'session'], $this->getExpectedCacheContexts())) ? 'UNCACHEABLE' : 'MISS';
-    $this->assertResourceResponse(200, NULL, $response, $this->getExpectedCacheTags(), $this->getExpectedCacheContexts(), FALSE, $dynamic_cache);
+    $this->assertResourceResponse(200, NULL, $response, $this->getExpectedCacheTags(), $this->getExpectedCacheContexts(), FALSE, $this->generateDynamicPageCacheExpectedHeaderValue($this->getExpectedCacheContexts()));