diff --git a/internal/util-cache/src/main/scala/sbt/internal/util/AdditionalFormats.scala b/internal/util-cache/src/main/scala/sbt/internal/util/AdditionalFormats.scala
index 6e74c26c7..79c90e9e4 100644
--- a/internal/util-cache/src/main/scala/sbt/internal/util/AdditionalFormats.scala
+++ b/internal/util-cache/src/main/scala/sbt/internal/util/AdditionalFormats.scala
@@ -1,12 +1,12 @@
 package sbt.internal.util
 
-import sbt.datatype.StringFormat
+import sbt.datatype.{ ArrayFormat, ByteFormat, StringFormat }
 import sbt.internal.util.Types.:+:
 
 import sjsonnew.{ Builder, deserializationError, JsonFormat, Unbuilder }
 import sjsonnew.BasicJsonProtocol.{ wrap, asSingleton }
 
-import java.io.File
+import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, File, InputStream, OutputStream }
 
 import java.net.{ URI, URL }
 
@@ -50,3 +50,19 @@ trait HListFormat {
   implicit val HNilFormat: JsonFormat[HNil] = asSingleton(HNil)
 
 }
+
+trait StreamFormat { self: ArrayFormat with ByteFormat =>
+  def streamFormat[T](write: (T, OutputStream) => Unit, read: InputStream => T): JsonFormat[T] = {
+    lazy val byteArrayFormat = implicitly[JsonFormat[Array[Byte]]]
+    val toBytes = (t: T) => { val bos = new ByteArrayOutputStream(); write(t, bos); bos.toByteArray }
+    val fromBytes = (bs: Array[Byte]) => read(new ByteArrayInputStream(bs))
+
+    new JsonFormat[T] {
+      override def read[J](jsOpt: Option[J], unbuilder: Unbuilder[J]): T =
+        fromBytes(byteArrayFormat.read(jsOpt, unbuilder))
+
+      override def write[J](obj: T, builder: Builder[J]): Unit =
+        byteArrayFormat.write(toBytes(obj), builder)
+    }
+  }
+}
diff --git a/internal/util-cache/src/main/scala/sbt/internal/util/CacheImplicits.scala b/internal/util-cache/src/main/scala/sbt/internal/util/CacheImplicits.scala
index 190282a6e..9e45b90c6 100644
--- a/internal/util-cache/src/main/scala/sbt/internal/util/CacheImplicits.scala
+++ b/internal/util-cache/src/main/scala/sbt/internal/util/CacheImplicits.scala
@@ -9,9 +9,11 @@ object CacheImplicits extends BasicCacheImplicits
   with ByteFormat
   with FileFormat
   with IntFormat
+  with HListFormat
   with LongFormat
   with StringFormat
   with URIFormat
   with URLFormat
+  with StreamFormat
   with TupleFormats
   with CollectionFormats
\ No newline at end of file