diff --git a/java/org/gnu/emacs/EmacsSafThread.java b/java/org/gnu/emacs/EmacsSafThread.java
index b3d6ab49f6d..9c3e3deb408 100644
--- a/java/org/gnu/emacs/EmacsSafThread.java
+++ b/java/org/gnu/emacs/EmacsSafThread.java
@@ -151,7 +151,7 @@ private final class DocIdEntry
     public
     DocIdEntry ()
     {
-      time = System.currentTimeMillis ();
+      time = System.uptimeMillis ();
     }
 
     /* Return a cache entry comprised of the state of the file
@@ -208,10 +208,7 @@ private final class DocIdEntry
 	}
       catch (Throwable e)
 	{
-	  if (e instanceof FileNotFoundException)
-	    return null;
-
-	  throw e;
+	  return null;
 	}
       finally
 	{
@@ -223,7 +220,7 @@ private final class DocIdEntry
     public boolean
     isValid ()
     {
-      return ((System.currentTimeMillis () - time)
+      return ((System.uptimeMillis () - time)
 	      < CACHE_INVALID_TIME);
     }
   };
@@ -243,13 +240,13 @@ private final class CacheEntry
     CacheEntry ()
     {
       children = new HashMap<String, DocIdEntry> ();
-      time = System.currentTimeMillis ();
+      time = System.uptimeMillis ();
     }
 
     public boolean
     isValid ()
     {
-      return ((System.currentTimeMillis () - time)
+      return ((System.uptimeMillis () - time)
 	      < CACHE_INVALID_TIME);
     }
   };