diff --git a/core/core.services.yml b/core/core.services.yml
index 0ea69d4..e135a6d 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -305,7 +305,12 @@ services:
     arguments: ['@path.alias_manager', '@cache.path']
   path.crud:
     class: Drupal\Core\Path\Path
-    arguments: ['@database', '@path.alias_manager']
+    arguments: ['@database', '@event_dispatcher']
+  path.crud_subscriber:
+    class: Drupal\Core\Path\PathCRUDSubscriber
+    tags:
+      - { name: event_subscriber }
+    arguments: ['@path.alias_manager.cached', '@module_handler']
 # The argument to the hashing service defined in services.yml, to the
 # constructor of PhpassHashedPassword is the log2 number of iterations for
 # password stretching.
diff --git a/core/lib/Drupal/Core/CacheDecorator/AliasManagerCacheDecorator.php b/core/lib/Drupal/Core/CacheDecorator/AliasManagerCacheDecorator.php
index 01264c2..f86b2ff 100644
--- a/core/lib/Drupal/Core/CacheDecorator/AliasManagerCacheDecorator.php
+++ b/core/lib/Drupal/Core/CacheDecorator/AliasManagerCacheDecorator.php
@@ -117,4 +117,12 @@ public function getPathLookups() {
   public function preloadPathLookups(array $path_list) {
     $this->aliasManager->preloadPathLookups($path_list);
   }
+
+  /**
+   * Implements \Drupal\Core\Path\AliasManagerInterface::cacheClear().
+   */
+  public function cacheClear() {
+    $this->cache->delete($this->cacheKey);
+    $this->aliasManager->cacheClear();
+  }
 }
diff --git a/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php
index 5f4563e..09aceb6 100644
--- a/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\EventSubscriber;
 
-use Drupal\Core\CacheDecorator\AliasManagerCacheDecorator;
+use Drupal\Core\Path\AliasManagerInterface;
 use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -23,7 +23,7 @@ class PathSubscriber extends PathListenerBase implements EventSubscriberInterfac
   /**
    * The alias manager that caches alias lookups based on the request.
    *
-   * @var \Drupal\Core\CacheDecorator\AliasManagerCacheDecorator
+   * @var \Drupal\Core\Path\AliasManagerInterface
    */
   protected $aliasManager;
 
@@ -34,7 +34,7 @@ class PathSubscriber extends PathListenerBase implements EventSubscriberInterfac
    */
   protected $pathProcessor;
 
-  public function __construct(AliasManagerCacheDecorator $alias_manager, InboundPathProcessorInterface $path_processor) {
+  public function __construct(AliasManagerInterface $alias_manager, InboundPathProcessorInterface $path_processor) {
     $this->aliasManager = $alias_manager;
     $this->pathProcessor = $path_processor;
   }
diff --git a/core/lib/Drupal/Core/Path/AliasManager.php b/core/lib/Drupal/Core/Path/AliasManager.php
index 72e5707..28b5e8f 100644
--- a/core/lib/Drupal/Core/Path/AliasManager.php
+++ b/core/lib/Drupal/Core/Path/AliasManager.php
@@ -131,13 +131,13 @@ public function getPathAlias($path, $path_language = NULL) {
   /**
    * Implements \Drupal\Core\Path\AliasManagerInterface::cacheClear().
    */
-  public function cacheClear($source = NULL) {
+  public function cacheClear() {
     $this->lookupMap = array();
     $this->noSource = array();
     $this->no_aliases = array();
     $this->firstCall = TRUE;
     $this->preloadedPathLookups = array();
-    $this->pathAliasWhitelistRebuild($source);
+    $this->pathAliasWhitelistRebuild();
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Path/AliasManagerInterface.php b/core/lib/Drupal/Core/Path/AliasManagerInterface.php
index 3dedd3e..cbeb071 100644
--- a/core/lib/Drupal/Core/Path/AliasManagerInterface.php
+++ b/core/lib/Drupal/Core/Path/AliasManagerInterface.php
@@ -54,4 +54,10 @@ public function getPathLookups();
    *   An array of system paths.
    */
   public function preloadPathLookups(array $path_list);
+
+
+  /**
+   * Clear internal caches in alias manager.
+   */
+  public function cacheClear();
 }
diff --git a/core/lib/Drupal/Core/Path/Path.php b/core/lib/Drupal/Core/Path/Path.php
index 4a3410f..0ac13d7 100644
--- a/core/lib/Drupal/Core/Path/Path.php
+++ b/core/lib/Drupal/Core/Path/Path.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Language\Language;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 
 /**
  * Defines a class for CRUD operations on path aliases.
@@ -24,21 +25,24 @@ class Path {
   protected $connection;
 
   /**
+   * An event dispatcher instance to use for configuration events.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcher
+   */
+  protected $event_dispatcher;
+
+  /**
    * Constructs a Path CRUD object.
    *
    * @param \Drupal\Core\Database\Connection $connection
    *   A database connection for reading and writing path aliases.
    *
-   * @param \Drupal\Core\Path\AliasManager $alias_manager
-   *   An alias manager with an internal cache of stored aliases.
-   *
-   * @todo This class should not take an alias manager in its constructor. Once
-   *   we move to firing an event for CRUD operations instead of invoking a
-   *   hook, we can have a listener that calls cacheClear() on the alias manager.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcher $event_dispatcher
+   *   An event dispatcher instance to use for configuration events.
    */
-  public function __construct(Connection $connection, AliasManager $alias_manager) {
+  public function __construct(Connection $connection, EventDispatcher $event_dispatcher) {
     $this->connection = $connection;
-    $this->alias_manager = $alias_manager;
+    $this->event_dispatcher = $event_dispatcher;
   }
 
   /**
@@ -78,8 +82,7 @@ public function save($source, $alias, $langcode = Language::LANGCODE_NOT_SPECIFI
         ->fields($fields);
       $pid = $query->execute();
       $fields['pid'] = $pid;
-      // @todo: Find a correct place to invoke hook_path_insert().
-      $hook = 'path_insert';
+      $hook = 'insert';
     }
     else {
       $fields['pid'] = $pid;
@@ -87,13 +90,10 @@ public function save($source, $alias, $langcode = Language::LANGCODE_NOT_SPECIFI
         ->fields($fields)
         ->condition('pid', $pid);
       $pid = $query->execute();
-      // @todo: figure out where we can invoke hook_path_update()
-      $hook = 'path_update';
+      $hook = 'update';
     }
     if ($pid) {
-      // @todo Switch to using an event for this instead of a hook.
-      module_invoke_all($hook, $fields);
-      $this->alias_manager->cacheClear();
+      $this->event_dispatcher->dispatch('path.' . $hook, new PathInsertUpdateEvent($fields));
       return $fields;
     }
     return FALSE;
@@ -137,9 +137,7 @@ public function delete($conditions) {
       $query->condition($field, $value);
     }
     $deleted = $query->execute();
-    // @todo Switch to using an event for this instead of a hook.
-    module_invoke_all('path_delete', $path);
-    $this->alias_manager->cacheClear();
+    $this->event_dispatcher->dispatch('path.delete', new PathDeleteEvent($path));
     return $deleted;
   }
 }
diff --git a/core/lib/Drupal/Core/Path/PathCRUDSubscriber.php b/core/lib/Drupal/Core/Path/PathCRUDSubscriber.php
new file mode 100644
index 0000000..a25347c
--- /dev/null
+++ b/core/lib/Drupal/Core/Path/PathCRUDSubscriber.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Path\PathCRUDSubscriber.
+ */
+
+namespace Drupal\Core\Path;
+
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Provides a path subscriber that converts path aliases.
+ */
+class PathCRUDSubscriber implements EventSubscriberInterface {
+
+  /**
+   * The alias manager that caches alias lookups based on the request.
+   *
+   * @var \Drupal\Core\Path\AliasManagerInterface
+   */
+  protected $aliasManager;
+
+  /**
+   * Module handler service.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  public function __construct(AliasManagerInterface $alias_manager, ModuleHandlerInterface $module_handler) {
+    $this->aliasManager = $alias_manager;
+    $this->moduleHandler = $module_handler;
+  }
+
+  /**
+   * Clears internal cache in alias manager on path alias CRUD events.
+   */
+  public function clearAliasManagerCaches() {
+    $this->aliasManager->cacheClear();
+  }
+
+  /**
+   * Invokes hook_path_update().
+   */
+  public function hookPathUpdate(PathInsertUpdateEvent $event) {
+    $this->moduleHandler->invokeAll('path_update', $event->getFields());
+  }
+
+  /**
+   * Invokes hook_path_insert().
+   */
+  public function hookPathInsert(PathInsertUpdateEvent $event) {
+    $this->moduleHandler->invokeAll('path_insert', $event->getFields());
+  }
+
+  /**
+   * Invokes hook_path_delete().
+   */
+  public function hookPathDelete(PathDeleteEvent $event) {
+    $this->moduleHandler->invokeAll('path_delete', $event->getPath());
+  }
+
+  /**
+   * Registers the methods in this class that should be listeners.
+   *
+   * @return array
+   *   An array of event listener definitions.
+   */
+  static function getSubscribedEvents() {
+    $events['path.update'][] = array('hookPathUpdate');
+    $events['path.insert'][] = array('hookPathInsert');
+    $events['path.delete'][] = array('hookPathDelete');
+    $events['path.update'][] = array('clearAliasManagerCaches');
+    $events['path.insert'][] = array('clearAliasManagerCaches');
+    $events['path.delete'][] = array('clearAliasManagerCaches');
+    return $events;
+  }
+}
diff --git a/core/lib/Drupal/Core/Path/PathDeleteEvent.php b/core/lib/Drupal/Core/Path/PathDeleteEvent.php
new file mode 100644
index 0000000..fd927be
--- /dev/null
+++ b/core/lib/Drupal/Core/Path/PathDeleteEvent.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Path\PathDeleteEvent.
+ */
+
+namespace Drupal\Core\Path;
+
+use Symfony\Component\EventDispatcher\Event;
+
+class PathDeleteEvent extends Event {
+
+  /**
+   * Path being deleted.
+   *
+   * @var string
+   */
+  protected $path;
+
+  /**
+   * Constructs PathDeleteEvent.
+   *
+   * @param string $path
+   *   Path being deleted.
+   */
+  public function __construct($path) {
+    $this->path = $path;
+  }
+
+  /**
+   * Returns path that is being deleted at this event.
+   *
+   * @return string
+   *   Path being deleted.
+   */
+  public function getPath() {
+    return $this->path;
+  }
+}
diff --git a/core/lib/Drupal/Core/Path/PathInsertUpdateEvent.php b/core/lib/Drupal/Core/Path/PathInsertUpdateEvent.php
new file mode 100644
index 0000000..0d70542
--- /dev/null
+++ b/core/lib/Drupal/Core/Path/PathInsertUpdateEvent.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Path\PathInsertUpdateEvent.
+ */
+
+namespace Drupal\Core\Path;
+
+use Symfony\Component\EventDispatcher\Event;
+
+class PathInsertUpdateEvent extends Event {
+
+  /**
+   * Information about path alias being inserted/updated.
+   *
+   * @var array
+   */
+  protected $fields;
+
+  /**
+   * Constructs PathInsertUpdateEvent.
+   *
+   * @param array $fields
+   *   Path alias information.
+   */
+  public function __construct($fields) {
+    $this->fields = $fields;
+  }
+
+  /**
+   * Returns path alias information.
+   *
+   * @return array
+   *   Array containing path alias information.
+   */
+  public function getFields() {
+    return $this->fields;
+  }
+}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php
index fed0ef4..d155418 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php
@@ -31,10 +31,8 @@ function testCRUD() {
     $connection = Database::getConnection();
     $this->fixtures->createTables($connection);
 
-    //Create AliasManager and Path object.
-    $whitelist = new AliasWhitelist('path_alias_whitelist', $this->container->get('cache.cache'), $this->container->get('lock'), $this->container->get('state'), $connection);
-    $aliasManager = new AliasManager($connection, $whitelist, $this->container->get('language_manager'));
-    $path = new Path($connection, $aliasManager);
+    //Create Path object.
+    $path = new Path($connection, $this->container->get('event_dispatcher'));
 
     $aliases = $this->fixtures->sampleUrlAliases();
 
@@ -86,9 +84,8 @@ function testLookupPath() {
     $this->fixtures->createTables($connection);
 
     //Create AliasManager and Path object.
-    $whitelist = new AliasWhitelist('path_alias_whitelist', $this->container->get('cache.cache'), $this->container->get('lock'), $this->container->get('state'), $connection);
-    $aliasManager = new AliasManager($connection, $whitelist, $this->container->get('language_manager'));
-    $pathObject = new Path($connection, $aliasManager);
+    $aliasManager = $this->container->get('path.alias_manager');
+    $pathObject = new Path($connection, $this->container->get('event_dispatcher'));
 
     // Test the situation where the source is the same for multiple aliases.
     // Start with a language-neutral alias, which we will override.
@@ -163,10 +160,9 @@ function testWhitelist() {
     $memoryCounterBackend = new MemoryCounterBackend('cache');
 
     // Create AliasManager and Path object.
-
     $whitelist = new AliasWhitelist('path_alias_whitelist', $memoryCounterBackend, $this->container->get('lock'), $this->container->get('state'), $connection);
     $aliasManager = new AliasManager($connection, $whitelist, $this->container->get('language_manager'));
-    $path = new Path($connection, $aliasManager);
+    $path = new Path($connection, $this->container->get('event_dispatcher'));
 
     // No alias for user and admin yet, so should be NULL.
     $this->assertNull($whitelist->get('user'));
@@ -178,18 +174,21 @@ function testWhitelist() {
 
     // Add an alias for user/1, user should get whitelisted now.
     $path->save('user/1', $this->randomName());
+    $aliasManager->cacheClear();
     $this->assertTrue($whitelist->get('user'));
     $this->assertNull($whitelist->get('admin'));
     $this->assertNull($whitelist->get($this->randomName()));
 
     // Add an alias for admin, both should get whitelisted now.
     $path->save('admin/something', $this->randomName());
+    $aliasManager->cacheClear();
     $this->assertTrue($whitelist->get('user'));
     $this->assertTrue($whitelist->get('admin'));
     $this->assertNull($whitelist->get($this->randomName()));
 
     // Remove the user alias again, whitelist entry should be removed.
     $path->delete(array('source' => 'user/1'));
+    $aliasManager->cacheClear();
     $this->assertNull($whitelist->get('user'));
     $this->assertTrue($whitelist->get('admin'));
     $this->assertNull($whitelist->get($this->randomName()));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MockAliasManager.php b/core/modules/system/lib/Drupal/system/Tests/Routing/MockAliasManager.php
index 6f5add4..8625942 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/MockAliasManager.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/MockAliasManager.php
@@ -89,4 +89,11 @@ public function getPathLookups() {
   public function preloadPathLookups(array $path_list) {
     // Not needed.
   }
+
+  /**
+   * Implements \Drupal\Core\Path\AliasManagerInterface::cacheClear().
+   */
+  public function cacheClear() {
+    // Not needed.
+  }
 }