diff --git a/caffeine/src/main/java/com/github/benmanes/caffeine/cache/BoundedLocalCache.java b/caffeine/src/main/java/com/github/benmanes/caffeine/cache/BoundedLocalCache.java
index b25c4aa3..df8707ce 100644
--- a/caffeine/src/main/java/com/github/benmanes/caffeine/cache/BoundedLocalCache.java
+++ b/caffeine/src/main/java/com/github/benmanes/caffeine/cache/BoundedLocalCache.java
@@ -842,7 +842,9 @@ abstract class BoundedLocalCache<K, V> extends BLCHeader.DrainStatusRef<K, V>
     Pacer pacer = pacer();
     if (pacer != null) {
       long delay = getExpirationDelay(now);
-      if (delay != Long.MAX_VALUE) {
+      if (delay == Long.MAX_VALUE) {
+        pacer.cancel();
+      } else {
         pacer.schedule(executor, drainBuffersTask, now, delay);
       }
     }
@@ -1883,6 +1885,12 @@ abstract class BoundedLocalCache<K, V> extends BLCHeader.DrainStatusRef<K, V>
         removeNode(entry.getValue(), now);
       }
 
+      // Cancel the scheduled cleanup
+      Pacer pacer = pacer();
+      if (pacer != null) {
+        pacer.cancel();
+      }
+
       // Discard all pending reads
       readBuffer.drainTo(e -> {});
     } finally {
diff --git a/caffeine/src/main/java/com/github/benmanes/caffeine/cache/Pacer.java b/caffeine/src/main/java/com/github/benmanes/caffeine/cache/Pacer.java
index 7bededbc..6d5b331c 100644
--- a/caffeine/src/main/java/com/github/benmanes/caffeine/cache/Pacer.java
+++ b/caffeine/src/main/java/com/github/benmanes/caffeine/cache/Pacer.java
@@ -49,10 +49,10 @@ final class Pacer {
 
     if (future == null) {
       // short-circuit an immediate scheduler causing an infinite loop during initialization
-      if (nextFireTime != 0) {
+      if (nextFireTime != 0L) {
         return;
       }
-    } else if ((nextFireTime - now) > 0) {
+    } else if ((nextFireTime - now) > 0L) {
       // Determine whether to reschedule
       if (maySkip(scheduleAt)) {
         return;
@@ -63,12 +63,21 @@ final class Pacer {
     future = scheduler.schedule(executor, command, actualDelay, TimeUnit.NANOSECONDS);
   }
 
+  /** Attempts to cancel execution of the scheduled task, if present. */
+  public void cancel() {
+    if (future != null) {
+      future.cancel(/* mayInterruptIfRunning */ false);
+      nextFireTime = 0L;
+      future = null;
+    }
+  }
+
   /**
    * Returns if the current fire time is sooner, or if it is later and within the tolerance limit.
    */
   boolean maySkip(long scheduleAt) {
     long delta = (scheduleAt - nextFireTime);
-    return (delta >= 0) || (-delta <= TOLERANCE);
+    return (delta >= 0L) || (-delta <= TOLERANCE);
   }
 
   /** Returns the delay and sets the next fire time. */