diff --git a/compile/ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala b/compile/ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala
index f203c58ca..ba478ea61 100644
--- a/compile/ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala
+++ b/compile/ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala
@@ -15,7 +15,7 @@ object ComponentCompiler {
   val compilerInterfaceSrcID = compilerInterfaceID + srcExtension
   val javaVersion = System.getProperty("java.class.version")
 
-  @deprecated("Use `interfaceProvider(ComponentManager, IvyConfiguration)`.", "0.13.10")
+  @deprecated("Use `interfaceProvider(ComponentManager, IvyConfiguration, File)`.", "0.13.10")
   def interfaceProvider(manager: ComponentManager): CompilerInterfaceProvider = new CompilerInterfaceProvider {
     def apply(scalaInstance: xsbti.compile.ScalaInstance, log: Logger): File =
       {
@@ -26,11 +26,11 @@ object ComponentCompiler {
       }
   }
 
-  def interfaceProvider(manager: ComponentManager, ivyConfiguration: IvyConfiguration): CompilerInterfaceProvider = new CompilerInterfaceProvider {
+  def interfaceProvider(manager: ComponentManager, ivyConfiguration: IvyConfiguration, bootDirectory: File): CompilerInterfaceProvider = new CompilerInterfaceProvider {
     def apply(scalaInstance: xsbti.compile.ScalaInstance, log: Logger): File =
       {
         // this is the instance used to compile the interface component
-        val componentCompiler = new IvyComponentCompiler(new RawCompiler(scalaInstance, ClasspathOptions.auto, log), manager, ivyConfiguration, log)
+        val componentCompiler = new IvyComponentCompiler(new RawCompiler(scalaInstance, ClasspathOptions.auto, log), manager, ivyConfiguration, bootDirectory, log)
         log.debug("Getting " + compilerInterfaceID + " from component compiler for Scala " + scalaInstance.version)
         componentCompiler(compilerInterfaceID)
       }
@@ -85,13 +85,16 @@ class ComponentCompiler(compiler: RawCompiler, manager: ComponentManager) {
  * The compiled classes are cached using the provided component manager according
  * to the actualVersion field of the RawCompiler.
  */
-private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: ComponentManager, ivyConfiguration: IvyConfiguration, log: Logger) {
+private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: ComponentManager, ivyConfiguration: IvyConfiguration, bootDirectory: File, log: Logger) {
   import ComponentCompiler._
 
+  private val sbtOrg = xsbti.ArtifactInfo.SbtOrganization
   private val sbtOrgTemp = JsonUtil.sbtOrgTemp
   private val modulePrefixTemp = "temp-module-"
   private val ivySbt: IvySbt = new IvySbt(ivyConfiguration)
   private val sbtVersion = ComponentManager.version
+  private val buffered = new BufferedLogger(FullLogger(log))
+  private val retrieveDirectory = new File(s"$bootDirectory/scala-${compiler.scalaInstance.version}/$sbtOrg/sbt/$sbtVersion/compiler-interface-srcs")
 
   def apply(id: String): File = {
     val binID = binaryID(id)
@@ -113,7 +116,7 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
               sourcesJar
             } getOrElse (throw new InvalidComponent(s"Couldn't retrieve default sources: module '$id'"))
 
-          log.debug(s"Fetching default sources: module '$id'")
+          buffered.debug(s"Fetching default sources: module '$id'")
           manager.files(id)(new IfMissing.Fallback(getAndDefineDefaultSources()))
 
         case version +: rest =>
@@ -124,7 +127,7 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
               sourcesJar
             } getOrElse interfaceSources(rest)
 
-          log.debug(s"Fetching version-specific sources: module '$moduleName'")
+          buffered.debug(s"Fetching version-specific sources: module '$moduleName'")
           manager.files(moduleName)(new IfMissing.Fallback(getAndDefineVersionSpecificSources()))
       }
     IO.withTemporaryDirectory { binaryDirectory =>
@@ -133,7 +136,8 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
       val xsbtiJars = manager.files(xsbtiID)(IfMissing.Fail)
 
       val sourceModuleVersions = VersionNumber(compiler.scalaInstance.actualVersion).cascadingVersions
-      AnalyzingCompiler.compileSources(interfaceSources(sourceModuleVersions), targetJar, xsbtiJars, id, compiler, log)
+      val sources = buffered bufferQuietly interfaceSources(sourceModuleVersions)
+      AnalyzingCompiler.compileSources(sources, targetJar, xsbtiJars, id, compiler, log)
 
       manager.define(binID, Seq(targetJar))
 
@@ -148,7 +152,7 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
   private def getModule(id: String): ivySbt.Module = {
     val sha1 = Hash.toHex(Hash(id))
     val dummyID = ModuleID(sbtOrgTemp, modulePrefixTemp + sha1, sbtVersion, Some("component"))
-    val moduleID = ModuleID(xsbti.ArtifactInfo.SbtOrganization, id, sbtVersion, Some("component")).sources()
+    val moduleID = ModuleID(sbtOrg, id, sbtVersion, Some("component")).sources()
     getModule(dummyID, Seq(moduleID))
   }
 
@@ -177,14 +181,13 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
 
   private def update(module: ivySbt.Module)(predicate: File => Boolean): Option[Seq[File]] = {
 
-    val retrieveDirectory = new File(ivyConfiguration.baseDirectory, "component")
     val retrieveConfiguration = new RetrieveConfiguration(retrieveDirectory, Resolver.defaultRetrievePattern, false)
     val updateConfiguration = new UpdateConfiguration(Some(retrieveConfiguration), true, UpdateLogging.DownloadOnly)
 
-    log.info(s"Attempting to fetch ${dependenciesNames(module)}. This operation may fail.")
-    IvyActions.updateEither(module, updateConfiguration, UnresolvedWarningConfiguration(), LogicalClock.unknown, None, log) match {
+    buffered.info(s"Attempting to fetch ${dependenciesNames(module)}. This operation may fail.")
+    IvyActions.updateEither(module, updateConfiguration, UnresolvedWarningConfiguration(), LogicalClock.unknown, None, buffered) match {
       case Left(unresolvedWarning) =>
-        log.debug("Couldn't retrieve module ${dependenciesNames(module)}.")
+        buffered.debug("Couldn't retrieve module ${dependenciesNames(module)}.")
         None
 
       case Right(updateReport) =>
@@ -195,8 +198,8 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
             (_, f) <- m.artifacts
           } yield f
 
-        log.debug(s"Files retrieved for ${dependenciesNames(module)}:")
-        log.debug(allFiles mkString ", ")
+        buffered.debug(s"Files retrieved for ${dependenciesNames(module)}:")
+        buffered.debug(allFiles mkString ", ")
 
         allFiles filter predicate match {
           case Seq() => None
diff --git a/main/actions/src/main/scala/sbt/Compiler.scala b/main/actions/src/main/scala/sbt/Compiler.scala
index f1dc6bbdf..5953c2a54 100644
--- a/main/actions/src/main/scala/sbt/Compiler.scala
+++ b/main/actions/src/main/scala/sbt/Compiler.scala
@@ -108,7 +108,8 @@ object Compiler {
     {
       val launcher = app.provider.scalaProvider.launcher
       val componentManager = new ComponentManager(launcher.globalLock, app.provider.components, Option(launcher.ivyHome), log)
-      val provider = ComponentCompiler.interfaceProvider(componentManager, ivyConfiguration)
+      val bootDirectory = launcher.bootDirectory
+      val provider = ComponentCompiler.interfaceProvider(componentManager, ivyConfiguration, bootDirectory)
       new AnalyzingCompiler(instance, provider, cpOptions)
     }