diff --git a/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php b/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
index 9862552..f9d86f0 100644
--- a/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
+++ b/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
@@ -53,7 +53,7 @@ public function register(ContainerBuilder $container) {
     // that we don't call it when cache tags are invalidated very early in the
     // installer.
     $container->getDefinition('cache_tags.invalidator.checksum')
-      ->clearTag('cache_tags.invalidator');
+      ->clearTag('cache_tags_invalidator');
 
     // Replace the route builder with an empty implementation.
     // @todo Convert installer steps into routes; add an installer.routing.yml.
diff --git a/core/modules/system/core.api.php b/core/modules/system/core.api.php
index 5ce09ab..78ffb9b 100644
--- a/core/modules/system/core.api.php
+++ b/core/modules/system/core.api.php
@@ -468,10 +468,10 @@
  * - An array of values. For example, the "node" tag indicates that particular
  *   node's data is present in the cache item, so its value is an array of node
  *   IDs.
- * Data that has been tagged can be deleted or invalidated as a group: no matter
+ * Data that has been tagged can be invalidated as a group: no matter
  * the Cache ID (cid) of the cache item, no matter in which cache bin a cache
  * item lives; as long as it is tagged with a certain cache tag, it will be
- * deleted or invalidated.
+ * invalidated.
  *
  * Because of that, cache tags are a solution to the cache invalidation problem:
  * - For caching to be effective, each cache item must only be invalidated when
@@ -512,8 +512,6 @@
  * \Drupal\Core\Entity\Entity::invalidateTagsOnSave() and
  * \Drupal\Core\Entity\Entity::invalidateTagsOnDelete().
  *
- * @todo Update cache tag deletion in https://drupal.org/node/918538
- *
  * @section configuration Configuration
  *
  * By default cached data is stored in the database. This can be configured