diff --git a/lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php b/lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php
index f8266f4e3d9d95dc5181b237c410a18026823166..3b27898479ee5502fe3049164becf258c0fe9872 100644
--- a/lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php
@@ -9,12 +9,11 @@
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
-
+use Drupal\views\Plugin\Discovery\ViewsDiscovery;
 
 class ArgumentDefaultPluginManager extends PluginManagerBase {
   public function __construct() {
-    $this->discovery = new AnnotatedClassDiscovery('views', 'argument_default');
+    $this->discovery = new ViewsDiscovery('views', 'argument_default');
     $this->factory = new DefaultFactory($this->discovery);
   }
 }
diff --git a/lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php b/lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php
index 0ac99341f57bfe6ba35edbb5098a9adfccada3ab..a2c473f9223ede61278a47c77fd1309032728abd 100644
--- a/lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php
@@ -10,11 +10,10 @@
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
 use Drupal\views\Plugin\Discovery\ViewsDiscovery;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 
 class ArgumentValidatorPluginManager extends PluginManagerBase {
   public function __construct() {
-    $this->discovery = new AnnotatedClassDiscovery('views', 'argument_validator');
+    $this->discovery = new ViewsDiscovery('views', 'argument_validator');
     $this->factory = new DefaultFactory($this->discovery);
   }
 }
diff --git a/lib/Drupal/views/Plugin/Type/CachePluginManager.php b/lib/Drupal/views/Plugin/Type/CachePluginManager.php
index 11fdc29df03bed7fdcb69672e6f7aa5c09465d1f..d48e0b0ca0b5f8171586760223df0e07148ab6e9 100644
--- a/lib/Drupal/views/Plugin/Type/CachePluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/CachePluginManager.php
@@ -10,11 +10,10 @@
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
 use Drupal\views\Plugin\Discovery\ViewsDiscovery;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 
 class CachePluginManager extends PluginManagerBase {
   public function __construct() {
-    $this->discovery = new AnnotatedClassDiscovery('views', 'cache');
+    $this->discovery = new ViewsDiscovery('views', 'cache');
     $this->factory = new DefaultFactory($this->discovery);
   }
 }