diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 15670a481..d93bcd5d4 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -388,6 +388,7 @@ object Defaults extends BuildCommon {
       pollInterval :== Watch.defaultPollInterval,
     ) ++ LintUnused.lintSettings
       ++ DefaultBackgroundJobService.backgroundJobServiceSettings
+      ++ RemoteCache.globalSettings
   )
 
   def defaultTestTasks(key: Scoped): Seq[Setting[_]] =
@@ -504,6 +505,7 @@ object Defaults extends BuildCommon {
   lazy val outputConfigPaths = Seq(
     classDirectory := crossTarget.value / (prefix(configuration.value.name) + "classes"),
     semanticdbTargetRoot := crossTarget.value / (prefix(configuration.value.name) + "meta"),
+    compileAnalysisTargetRoot := crossTarget.value / (prefix(configuration.value.name) + "zinc"),
     target in doc := crossTarget.value / (prefix(configuration.value.name) + "api")
   )
 
@@ -637,7 +639,7 @@ object Defaults extends BuildCommon {
         manipulateBytecode.value.analysis.readStamps.getAllProductStamps.keySet.asScala
       (classFiles.toSeq map { x =>
         c.toPath(x)
-      }) :+ compileAnalysisFileTask.value.toPath
+      }) :+ compileAnalysisFile.value.toPath
     },
     compileOutputs := compileOutputs.triggeredBy(compile).value,
     clean := (compileOutputs / clean).value,
@@ -655,6 +657,9 @@ object Defaults extends BuildCommon {
         else ""
       s"inc_compile$extra.zip"
     },
+    compileAnalysisFile := {
+      compileAnalysisTargetRoot.value / compileAnalysisFilename.value
+    },
     /*
     // Comment this out because Zinc now uses farm hash to invalidate the virtual paths.
     // To use watch to detect initial changes, we need to revalidate using content hash.
@@ -1887,8 +1892,6 @@ object Defaults extends BuildCommon {
       incCompiler.compile(i, s.log)
     } finally x.close() // workaround for #937
   }
-  private def compileAnalysisFileTask: Def.Initialize[Task[File]] =
-    Def.task(streams.value.cacheDirectory / compileAnalysisFilename.value)
   def compileIncSetupTask = Def.task {
     val converter = fileConverter.value
     val lookup = new PerClasspathEntryLookup {
@@ -1906,7 +1909,7 @@ object Defaults extends BuildCommon {
       lookup,
       (skip in compile).value,
       // TODO - this is kind of a bad way to grab the cache directory for streams...
-      compileAnalysisFileTask.value.toPath,
+      compileAnalysisFile.value.toPath,
       compilerCache.value,
       incOptions.value,
       (compilerReporter in compile).value,
@@ -2288,7 +2291,7 @@ object Classpaths {
   val jvmPublishSettings: Seq[Setting[_]] = Seq(
     artifacts := artifactDefs(defaultArtifactTasks).value,
     packagedArtifacts := packaged(defaultArtifactTasks).value
-  )
+  ) ++ RemoteCache.projectSettings
 
   val ivyPublishSettings: Seq[Setting[_]] = publishGlobalDefaults ++ Seq(
     artifacts :== Nil,
diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala
index 7e57e629c..acfd794f4 100644
--- a/main/src/main/scala/sbt/Keys.scala
+++ b/main/src/main/scala/sbt/Keys.scala
@@ -208,7 +208,9 @@ object Keys {
   val compileIncremental = taskKey[CompileResult]("Actually runs the incremental compilation").withRank(DTask)
   val previousCompile = taskKey[PreviousResult]("Read the incremental compiler analysis from disk").withRank(DTask)
   val compilers = taskKey[Compilers]("Defines the Scala and Java compilers to use for compilation.").withRank(DTask)
-  val compileAnalysisFilename = taskKey[String]("Defines the filename used to store the incremental compiler analysis file (inside the streams cacheDirectory).").withRank(DTask)
+  val compileAnalysisFilename = taskKey[String]("Defines the filename used for compileAnalysisFile.").withRank(DTask)
+  val compileAnalysisTargetRoot = settingKey[File]("The output directory to produce Zinc Analysis files").withRank(DSetting)
+  val compileAnalysisFile = taskKey[File]("Zinc analysis storage.").withRank(DSetting)
   val compileIncSetup = taskKey[Setup]("Configures aspects of incremental compilation.").withRank(DTask)
   val compilerCache = taskKey[GlobalsCache]("Cache of scala.tools.nsc.Global instances.  This should typically be cached so that it isn't recreated every task run.").withRank(DTask)
   val stateCompilerCache = AttributeKey[GlobalsCache]("stateCompilerCache", "Internal use: Global cache.")
@@ -229,6 +231,7 @@ object Keys {
   val `package` = taskKey[File]("Produces the main artifact, such as a binary jar.  This is typically an alias for the task that actually does the packaging.").withRank(APlusTask)
   val packageDoc = taskKey[File]("Produces a documentation artifact, such as a jar containing API documentation.").withRank(AMinusTask)
   val packageSrc = taskKey[File]("Produces a source artifact, such as a jar containing sources and resources.").withRank(AMinusTask)
+  val packageCache = taskKey[File]("Produces the main artifact for caching.")
 
   val packageOptions = taskKey[Seq[PackageOption]]("Options for packaging.").withRank(BTask)
   val packageConfiguration = taskKey[Package.Configuration]("Collects all inputs needed for packaging.").withRank(DTask)
@@ -338,6 +341,16 @@ object Keys {
   val internalDependencyConfigurations = settingKey[Seq[(ProjectRef, Set[String])]]("The project configurations that this configuration depends on")
   val closeClassLoaders = settingKey[Boolean]("Close classloaders in run and test when the task completes.").withRank(DSetting)
   val allowZombieClassLoaders = settingKey[Boolean]("Allow a classloader that has previously been closed by `run` or `test` to continue loading classes.")
+  // val useRemoteCache = settingKey[Boolean]("Use remote cache.")
+  val remoteCacheId = taskKey[String]("Unique identifier for the remote cache.")
+  val remoteCacheProjectId = taskKey[ModuleID]("ModuleID used for remote cache JARs.")
+  val remoteCacheIdCandidates = taskKey[Seq[String]]("Remote cache ids to pull.")
+  val pullRemoteCache = taskKey[Unit]("Retrieve remote cache.")
+  val pushRemoteCache = taskKey[Unit]("Push remote cache to the cache server.")
+  val pushRemoteCacheArtifact = settingKey[Boolean]("Enables publishing an artifact to remote cache.")
+  val pushRemoteCacheConfiguration = taskKey[PublishConfiguration]("")
+  val pushRemoteCacheTo = settingKey[Option[Resolver]]("The resolver to publish remote cache to.")
+  val remoteCachePom = taskKey[File]("Generates a pom for publishing when publishing Maven-style.")
 
   val bspTargetIdentifier = settingKey[BuildTargetIdentifier]("Id for BSP build target.").withRank(DSetting)
   val bspWorkspace = settingKey[Map[BuildTargetIdentifier, Scope]]("Mapping of BSP build targets to sbt scopes").withRank(DSetting)
diff --git a/main/src/main/scala/sbt/internal/RemoteCache.scala b/main/src/main/scala/sbt/internal/RemoteCache.scala
new file mode 100644
index 000000000..5158b8162
--- /dev/null
+++ b/main/src/main/scala/sbt/internal/RemoteCache.scala
@@ -0,0 +1,224 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
+package sbt
+package internal
+
+import java.io.File
+import Keys._
+import SlashSyntax0._
+import Project._ // for tag and inTask()
+import std.TaskExtra._ // for join
+import sbt.coursierint.LMCoursier
+import sbt.librarymanagement._
+import sbt.librarymanagement.ivy.Credentials
+import sbt.librarymanagement.syntax._
+import sbt.internal.librarymanagement._
+import sbt.io.IO
+import sbt.io.syntax._
+import sbt.internal.inc.JarUtils
+
+object RemoteCache {
+  final val cachedCompileClassifier = "cached-compile"
+  final val cachedTestClasifier = "cached-test"
+
+  def gitCommitId: String =
+    scala.sys.process.Process("git rev-parse --short HEAD").!!.trim
+
+  lazy val globalSettings: Seq[Def.Setting[_]] = Seq(
+    remoteCacheId := gitCommitId,
+    pushRemoteCacheTo :== None,
+  )
+
+  lazy val projectSettings: Seq[Def.Setting[_]] = (Seq(
+    remoteCacheProjectId := {
+      val o = organization.value
+      val m = moduleName.value
+      val id = remoteCacheId.value
+      val c = (projectID / crossVersion).value
+      val v = s"0.0.0-$id"
+      ModuleID(o, m, v).cross(c)
+    },
+    pushRemoteCacheConfiguration / publishMavenStyle := true,
+    pushRemoteCacheConfiguration / artifacts := artifactDefs(defaultArtifactTasks).value,
+    pushRemoteCacheConfiguration / packagedArtifacts := packaged(defaultArtifactTasks).value,
+    Compile / packageCache / pushRemoteCacheArtifact := true,
+    Test / packageCache / pushRemoteCacheArtifact := true,
+    Compile / packageCache / artifact := Artifact(moduleName.value, cachedCompileClassifier),
+    Test / packageCache / artifact := Artifact(moduleName.value, cachedTestClasifier),
+    remoteCachePom / pushRemoteCacheArtifact := true,
+    pushRemoteCacheConfiguration := {
+      Classpaths.publishConfig(
+        (pushRemoteCacheConfiguration / publishMavenStyle).value,
+        Classpaths.deliverPattern(crossTarget.value),
+        if (isSnapshot.value) "integration" else "release",
+        ivyConfigurations.value.map(c => ConfigRef(c.name)).toVector,
+        (pushRemoteCacheConfiguration / packagedArtifacts).value.toVector,
+        (pushRemoteCacheConfiguration / checksums).value.toVector,
+        Classpaths.getPublishTo(pushRemoteCacheTo.value).name,
+        ivyLoggingLevel.value,
+        isSnapshot.value
+      )
+    },
+    pullRemoteCache := {
+      val s = streams.value
+      val smi = scalaModuleInfo.value
+      val dr = (pullRemoteCache / dependencyResolution).value
+      val is = (pushRemoteCache / ivySbt).value
+      val t = crossTarget.value / "cache-download"
+      val p = remoteCacheProjectId.value
+      val id = remoteCacheId.value
+      val compileAf = (Compile / compileAnalysisFile).value
+      val compileOutput = (Compile / classDirectory).value
+      val testAf = (Test / compileAnalysisFile).value
+      val testOutput = (Test / classDirectory).value
+      val testStreams = (Test / test / streams).value
+      val testResult = Defaults.succeededFile(testStreams.cacheDirectory)
+
+      val deps = Vector(p.classifier(cachedCompileClassifier), p.classifier(cachedTestClasifier))
+      val mconfig = dummyModule(smi, deps)
+      val m = new is.Module(mconfig)
+      dr.retrieve(m, t, s.log) match {
+        case Right(xs0) =>
+          val xs = xs0.distinct
+          xs.find(_.toString.endsWith(s"$id-$cachedCompileClassifier.jar")) foreach { jar: File =>
+            extractCache(jar, compileOutput, compileAf, None)
+          }
+          xs.find(_.toString.endsWith(s"$id-$cachedTestClasifier.jar")) foreach { jar: File =>
+            extractCache(jar, testOutput, testAf, Some(testResult))
+          }
+          ()
+        case Left(unresolvedWarning) =>
+          s.log.info(s"remote cache not found for ${id}")
+      }
+    },
+    remoteCachePom := {
+      val s = streams.value
+      val config = makePomConfiguration.value
+      val publisher = Keys.publisher.value
+      publisher.makePomFile((pushRemoteCache / ivyModule).value, config, s.log)
+      config.file.get
+    },
+    remoteCachePom / packagedArtifact := ((makePom / artifact).value -> remoteCachePom.value),
+  ) ++ inTask(pushRemoteCache)(
+    Seq(
+      ivyConfiguration := {
+        val other = pushRemoteCacheTo.value.toVector
+        val config0 = Classpaths.mkIvyConfiguration.value
+        config0
+          .withOtherResolvers(other)
+          .withResolutionCacheDir(crossTarget.value / "alt-resolution")
+      },
+      ivySbt := {
+        val config0 = ivyConfiguration.value
+        Credentials.register(credentials.value, streams.value.log)
+        new IvySbt(config0, CustomHttp.okhttpClient.value)
+      },
+      ivyModule := {
+        val is = ivySbt.value
+        new is.Module(moduleSettings.value)
+      },
+      moduleSettings := {
+        val smi = scalaModuleInfo.value
+        ModuleDescriptorConfiguration(remoteCacheProjectId.value, projectInfo.value)
+          .withScalaModuleInfo(smi)
+      },
+      pushRemoteCache.in(Defaults.TaskZero) := (Def.task {
+        val s = streams.value
+        val config = pushRemoteCacheConfiguration.value
+        IvyActions.publish(ivyModule.value, config, s.log)
+      } tag (Tags.Publish, Tags.Network)).value,
+    )
+  ) ++ inTask(pullRemoteCache)(
+    Seq(
+      dependencyResolution := Defaults.dependencyResolutionTask.value,
+      csrConfiguration := {
+        val rs = pushRemoteCacheTo.value.toVector
+        LMCoursier.scalaCompilerBridgeConfigurationTask.value
+          .withResolvers(rs)
+      }
+    )
+  ) ++ inConfig(Compile)(packageCacheSettings)
+    ++ inConfig(Test)(packageCacheSettings))
+
+  def packageCacheSettings: Seq[Def.Setting[_]] =
+    inTask(packageCache)(
+      Seq(
+        packageCache.in(Defaults.TaskZero) := {
+          val original = packageBin.in(Defaults.TaskZero).value
+          val artp = artifactPath.value
+          val af = compileAnalysisFile.value
+          IO.copyFile(original, artp)
+          if (af.exists) {
+            JarUtils.includeInJar(artp, Vector(af -> s"META-INF/inc_compile.zip"))
+          }
+          // val testStream = (test / streams).?.value
+          // testStream foreach { s =>
+          //   val sf = Defaults.succeededFile(s.cacheDirectory)
+          //   if (sf.exists) {
+          //     JarUtils.includeInJar(artp, Vector(sf -> s"META-INF/succeeded_tests"))
+          //   }
+          // }
+          artp
+        },
+        packagedArtifact := (artifact.value -> packageCache.value),
+        artifactPath := Defaults.artifactPathSetting(artifact).value,
+      )
+    )
+
+  private def extractCache(
+      jar: File,
+      output: File,
+      analysisFile: File,
+      testResult: Option[File]
+  ): Unit = {
+    IO.delete(output)
+    IO.unzip(jar, output)
+    val expandedAnalysis = output / "META-INF" / "inc_compile.zip"
+    if (expandedAnalysis.exists) {
+      IO.move(expandedAnalysis, analysisFile)
+    }
+    // testResult match {
+    //   case Some(r) =>
+    //     val expandedTestResult = output / "META-INF" / "succeeded_tests"
+    //     if (expandedTestResult.exists) {
+    //       IO.move(expandedTestResult, r)
+    //     }
+    //   case _ => ()
+    // }
+    ()
+  }
+
+  private def dummyModule(
+      smi: Option[ScalaModuleInfo],
+      deps: Vector[ModuleID]
+  ): ModuleDescriptorConfiguration = {
+    val module = ModuleID("com.example.temp", "fake", "0.1.0-SNAPSHOT")
+    val info = ModuleInfo("fake", "", None, None, Vector(), "", None, None, Vector())
+    ModuleDescriptorConfiguration(module, info)
+      .withScalaModuleInfo(smi)
+      .withDependencies(deps)
+  }
+
+  private def defaultArtifactTasks: Seq[TaskKey[File]] =
+    Seq(remoteCachePom, Compile / packageCache, Test / packageCache)
+
+  private def packaged(pkgTasks: Seq[TaskKey[File]]): Def.Initialize[Task[Map[Artifact, File]]] =
+    enabledOnly(packagedArtifact.toSettingKey, pkgTasks) apply (_.join.map(_.toMap))
+
+  private def artifactDefs(pkgTasks: Seq[TaskKey[File]]): Def.Initialize[Seq[Artifact]] =
+    enabledOnly(artifact, pkgTasks)
+
+  private def enabledOnly[A](
+      key: SettingKey[A],
+      pkgTasks: Seq[TaskKey[File]]
+  ): Def.Initialize[Seq[A]] =
+    (Classpaths.forallIn(key, pkgTasks) zipWith
+      Classpaths.forallIn(pushRemoteCacheArtifact, pkgTasks))(_ zip _ collect {
+      case (a, true) => a
+    })
+}