diff --git a/src/AliasTypeManager.php b/src/AliasTypeManager.php
index acaac9a..6f13a3b 100644
--- a/src/AliasTypeManager.php
+++ b/src/AliasTypeManager.php
@@ -63,16 +63,12 @@ class AliasTypeManager extends DefaultPluginManager implements FallbackPluginMan
   /**
    * Gets the definition of all visible plugins for this type.
    *
-   * @return mixed[]
+   * @return array
    *   An array of plugin definitions (empty array if no definitions were
    *   found). Keys are plugin IDs.
    */
   public function getVisibleDefinitions() {
-    $definitions = $this->getCachedDefinitions();
-    if (!isset($definitions)) {
-      $definitions = $this->findDefinitions();
-      $this->setCachedDefinitions($definitions);
-    }
+    $definitions = $this->getDefinitions();
     unset($definitions['broken']);
     return $definitions;
   }
diff --git a/src/Form/PathautoAdminDelete.php b/src/Form/PathautoAdminDelete.php
index cc05a28..f0ad9bc 100644
--- a/src/Form/PathautoAdminDelete.php
+++ b/src/Form/PathautoAdminDelete.php
@@ -69,7 +69,7 @@ class PathautoAdminDelete extends FormBase {
       '#description' => t('Delete all aliases. Number of aliases which will be deleted: %count.', array('%count' => $total_count)),
     );
 
-    // Next, iterate over all visible alias types
+    // Next, iterate over all visible alias types.
     $definitions = $this->aliasTypeManager->getVisibleDefinitions();
 
     foreach ($definitions as $id => $definition) {
diff --git a/src/Form/PathautoSettingsForm.php b/src/Form/PathautoSettingsForm.php
index d01055e..78eb7c9 100644
--- a/src/Form/PathautoSettingsForm.php
+++ b/src/Form/PathautoSettingsForm.php
@@ -251,7 +251,8 @@ class PathautoSettingsForm extends ConfigFormBase {
       if ($key == 'enabled_entity_types') {
         $enabled_entity_types = [];
         foreach ($value as $entity_type_id => $enabled) {
-          if ($enabled) {
+          $field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
+          if ($enabled && ($field_definitions['path']->getProvider() === 'pathauto')) {
             $enabled_entity_types[] = $entity_type_id;
           }
         }