diff --git a/core/core.services.yml b/core/core.services.yml
index 0026104..2b54b88 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -386,13 +386,11 @@ services:
     calls:
       - [setContainer, ['@service_container']]
       - [setRequest, ['@?request']]
-    scope: request
   access_subscriber:
     class: Drupal\Core\EventSubscriber\AccessSubscriber
     tags:
       - { name: event_subscriber }
     arguments: ['@access_manager']
-    scope: request
   access_check.default:
     class: Drupal\Core\Access\DefaultAccessCheck
     tags:
@@ -610,7 +608,6 @@ services:
     factory_method: authenticate
     factory_service: authentication
     arguments: ['@request']
-    scope: request
   asset.css.collection_renderer:
     class: Drupal\Core\Asset\CssCollectionRenderer
   asset.css.collection_optimizer:
diff --git a/core/modules/block/lib/Drupal/block/Access/BlockThemeAccessCheck.php b/core/modules/block/lib/Drupal/block/Access/BlockThemeAccessCheck.php
index d7890f1..63e2d2c 100644
--- a/core/modules/block/lib/Drupal/block/Access/BlockThemeAccessCheck.php
+++ b/core/modules/block/lib/Drupal/block/Access/BlockThemeAccessCheck.php
@@ -27,9 +27,9 @@ public function appliesTo() {
   /**
    * {@inheritdoc}
    */
-  public function access(Route $route, Request $request) {
+  public function access(Route $route, Request $request, AccountInterface $account) {
     $theme = $request->attributes->get('theme');
-    return (user_access('administer blocks') && drupal_theme_access($theme)) ? static::ALLOW : static::DENY;
+    return ($account->hasPermission('administer blocks') && drupal_theme_access($theme)) ? static::ALLOW : static::DENY;
   }
 
 }