diff --git a/.ci/before_install.sh b/.ci/before_install.sh
index bd1ec5ec33..615e06baed 100755
--- a/.ci/before_install.sh
+++ b/.ci/before_install.sh
@@ -1,13 +1,28 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+ccache_wrapper () {
+  mkdir -p ~/ccache
+  echo '#!/bin/sh' >> ~/ccache/ccache-"$1"
+  echo "ccache $1 \"\$*\"" >> ~/ccache/ccache-"$1"
+  chmod +x ~/ccache/ccache-"$1"
+}
+
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   brew update
-  brew install findutils
+  brew install findutils ccache
   brew cask reinstall java
   brew unlink python # fixes 'run_one_line' is not defined error in backtrace
+  ccache_wrapper clang
+  ccache_wrapper clang++
+  ln -sf "$(command -v ccache)" "$(command -v clang)"
+  ln -sf "$(command -v ccache)" "$(command -v clang++)"
 fi
 
 if [[ "${TRAVIS_OS_NAME}" == linux ]]; then
   wget https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh
+  ccache_wrapper gcc
+  ccache_wrapper g++
+  ln -sf "$(command -v ccache)" "$(command -v gcc)"
+  ln -sf "$(command -v ccache)" "$(command -v g++)"
 fi
diff --git a/.ci/script.sh b/.ci/script.sh
index 493641c79a..168cbff2ad 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -7,7 +7,7 @@ BOOT_JDK10="jdk-10-ea+${BOOT_JDK10_VER}"
 echo "which java: $(which java)"
 ulimit -c unlimited -S
 
-sh ./gradlew build -x :web:test --no-daemon --stacktrace --info
+sh ./gradlew build -x :web:test --no-daemon --stacktrace --info --console=plain
 
 # Print core dumps when JVM crashes.
 RESULT=$?
diff --git a/.travis.yml b/.travis.yml
index 35f8dee909..37b9a7ee4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-language: java
+language: c
 sudo: false
 
 addons:
@@ -39,6 +39,7 @@ before_cache:
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 
 cache:
+  ccache: true
   directories:
     - $HOME/.gradle/caches/
 
diff --git a/appveyor.yml b/appveyor.yml
index 5c2ca8069c..f2b654b3c5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,7 +23,7 @@ build_script:
       $env:VSVARS32FILE = "$env:VCINSTALLDIR\vcvars32.bat"
       refreshenv
       # Must invoke gradle with cmd.exe so stderr output doesn't fail the build:
-  - cmd: gradlew test -PCOMPILE_WEBKIT=false --stacktrace -x :web:test --info --no-daemon
+  - cmd: gradlew test -PCOMPILE_WEBKIT=false --stacktrace -x :web:test --info --no-daemon --console=plain
 on_finish:
   - ps: |
         $crashes = Get-ChildItem -Include hs_err_pid*.log -Recurse
diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
index 29fc606afd..7305e0be71 100644
--- a/buildSrc/linux.gradle
+++ b/buildSrc/linux.gradle
@@ -189,8 +189,8 @@ setupTools("linux_freetype_tools",
     }
 )
 
-def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "gcc";
-def linker = IS_COMPILE_PARFAIT ? "parfait-g++" : "g++";
+def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "gcc"
+def linker = IS_COMPILE_PARFAIT ? "parfait-g++" : "g++"
 
 LINUX.glass = [:]
 LINUX.glass.variants = ["glass", "glassgtk2"]
diff --git a/buildSrc/mac.gradle b/buildSrc/mac.gradle
index 63419c43a8..f47bace633 100644
--- a/buildSrc/mac.gradle
+++ b/buildSrc/mac.gradle
@@ -128,8 +128,8 @@ def linkFlags = [
         "-dynamiclib", "-lobjc"].flatten();
 
 
-def compiler = IS_COMPILE_PARFAIT ? "parfait-clang" : "clang";
-def linker = IS_COMPILE_PARFAIT ? "parfait-clang++" : "clang++";
+def compiler = IS_COMPILE_PARFAIT ? "parfait-clang" : "clang"
+def linker = IS_COMPILE_PARFAIT ? "parfait-clang++" : "clang++"
 
 MAC.glass = [:]
 MAC.glass.javahInclude = [
diff --git a/buildSrc/src/main/groovy/com/sun/javafx/gradle/CCTask.groovy b/buildSrc/src/main/groovy/com/sun/javafx/gradle/CCTask.groovy
index 578c583068..3b72a2baf1 100644
--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/CCTask.groovy
+++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/CCTask.groovy
@@ -51,7 +51,6 @@ class CCTask extends NativeCompileTask {
         // debug builds, otherwise that flag is ignored "/Fd" or "-Fd"
         project.exec({
             commandLine(compiler);
-
             // Add in any additional compilation params
             if (params != null) {
                 // A little hack. Only use the -std=c99 flag if compiling .c or .m