diff --git a/redirect.install b/redirect.install
index ccbcf7d..4ef1f95 100644
--- a/redirect.install
+++ b/redirect.install
@@ -155,20 +155,10 @@ function redirect_update_8103() {
  */
 function redirect_update_8104() {
   $config = \Drupal::configFactory()->getEditable('redirect.settings');
-  if ($config->get('term_path_handler')) {
-    $config->clear('term_path_handler');
-  }
-  if ($config->get('normalize_aliases')) {
-    $config->clear('normalize_aliases');
-  }
-  if ($config->get('deslash')) {
-    $config->clear('deslash');
-  }
-  if ($config->get('frontpage_redirect')) {
-    $config->clear('frontpage_redirect');
-  }
-  if ($config->get('nonclean_to_clean')) {
-    $config->clear('nonclean_to_clean');
-  }
+  $config->clear('term_path_handler');
+  $config->clear('normalize_aliases');
+  $config->clear('deslash');
+  $config->clear('frontpage_redirect');
+  $config->clear('nonclean_to_clean');
   $config->save();
 }
\ No newline at end of file
diff --git a/src/EventSubscriber/RouteNormalizerRequestSubscriber.php b/src/EventSubscriber/RouteNormalizerRequestSubscriber.php
index 2c29600..ea848d8 100644
--- a/src/EventSubscriber/RouteNormalizerRequestSubscriber.php
+++ b/src/EventSubscriber/RouteNormalizerRequestSubscriber.php
@@ -116,7 +116,7 @@ class RouteNormalizerRequestSubscriber implements EventSubscriberInterface {
    * {@inheritdoc}
    */
   static function getSubscribedEvents() {
-    $events[KernelEvents::REQUEST][] = array('onKernelRequestRedirect');
+    $events[KernelEvents::REQUEST][] = array('onKernelRequestRedirect', 30);
     return $events;
   }
 
diff --git a/src/Tests/GlobalRedirectTest.php b/src/Tests/GlobalRedirectTest.php
index 2222943..519096b 100644
--- a/src/Tests/GlobalRedirectTest.php
+++ b/src/Tests/GlobalRedirectTest.php
@@ -114,11 +114,6 @@ class GlobalRedirectTest extends WebTestBase {
     $term->save();
 
     $this->term = $term;
-
-    \Drupal::service('module_installer')->uninstall([
-      'dynamic_page_cache',
-    ]);
-
   }
 
   /**