diff --git a/internal/util-cache/src/main/scala/sbt/internal/util/FileInfo.scala b/internal/util-cache/src/main/scala/sbt/internal/util/FileInfo.scala
index 28cf7de86..b9d89b594 100644
--- a/internal/util-cache/src/main/scala/sbt/internal/util/FileInfo.scala
+++ b/internal/util-cache/src/main/scala/sbt/internal/util/FileInfo.scala
@@ -4,6 +4,7 @@
 package sbt.internal.util
 
 import java.io.File
+import scala.util.control.NonFatal
 import sbt.io.Hash
 import sjsonnew.{ Builder, JsonFormat, Unbuilder, deserializationError }
 import CacheImplicits._
@@ -30,7 +31,7 @@ object FileInfo {
   sealed trait Style {
     type F <: FileInfo
 
-    implicit val format: JsonFormat[F]
+    implicit def format: JsonFormat[F]
 
     def apply(file: File): F
     def apply(files: Set[File]): FilesInfo[F] = FilesInfo(files map apply)
@@ -91,7 +92,7 @@ object FileInfo {
 
     implicit def apply(file: File): HashFileInfo = FileHash(file.getAbsoluteFile, computeHash(file))
 
-    private def computeHash(file: File): List[Byte] = try Hash(file).toList catch { case _: Exception => Nil }
+    private def computeHash(file: File): List[Byte] = try Hash(file).toList catch { case NonFatal(_) => Nil }
   }
 
   object lastModified extends Style {