diff --git a/modules/redirect_404/src/SqlRedirectNotFoundStorage.php b/modules/redirect_404/src/SqlRedirectNotFoundStorage.php
index 8b425e9..02c1986 100644
--- a/modules/redirect_404/src/SqlRedirectNotFoundStorage.php
+++ b/modules/redirect_404/src/SqlRedirectNotFoundStorage.php
@@ -68,7 +68,7 @@ class SqlRedirectNotFoundStorage implements RedirectNotFoundStorageInterface {
       ->key('langcode', $langcode)
       ->expression('count', 'count + 1')
       ->fields([
-        'timestamp' => REQUEST_TIME,
+        'timestamp' => \Drupal::time()->getRequestTime(),
         'count' => 1,
         'resolved' => 0,
       ])
diff --git a/redirect.generate.inc b/redirect.generate.inc
index 6120ae1..e0726d6 100644
--- a/redirect.generate.inc
+++ b/redirect.generate.inc
@@ -139,14 +139,15 @@ function redirect_generate_batch_generate($num, array &$context) {
     $redirect->save();
 
     if (mt_rand(0, 1)) {
-    $query = \Drupal::database();
-    $query->update('redirect')
-      ->fields(array(
-        'count' => mt_rand(1, 500),
-        'access' => mt_rand(REQUEST_TIME - 31536000, REQUEST_TIME),
-      ))
-      ->condition('rid', $redirect->id())
-      ->execute();
+      $request_time = \Drupal::time()->getRequestTime();
+      $query = \Drupal::database();
+      $query->update('redirect')
+        ->fields(array(
+          'count' => mt_rand(1, 500),
+          'access' => mt_rand($request_time - 31536000, $request_time),
+        ))
+        ->condition('rid', $redirect->id())
+        ->execute();
     }
 
     $context['results'][] = $redirect->id();