diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f74e6dc..cd0be079 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,37 +4,59 @@ stages:
 
 variables:
   FEATURES: ""
+  RUST_BACKTRACE: "full"
+
+.stable:
+  image: rust:latest
+  cache:
+    key: stable
+    paths:
+      - target/
+
+.nightly:
+  image: rustlang/rust:nightly
+  cache:
+    key: nightly
+    paths:
+      - target/
+
+.build:
+  stage: build
+  script:
+    - cargo build --verbose --no-default-features --features=$FEATURES
+
+.test:
+  stage: test
+  script:
+    - cargo test --verbose --no-default-features --features=$FEATURES
 
 rust-latest-build:
-  stage: build
-  image: rust:latest
-  script:
-    - cargo build --verbose --no-default-features --features=$FEATURES
+  extends:
+    - .build
+    - .stable
 
 rust-nightly-build:
-  stage: build
-  image: rustlang/rust:nightly
-  script:
-    - cargo build --verbose --no-default-features --features=$FEATURES
+  extends:
+    - .build
+    - .nightly
+
 
 rust-latest-test:
-  stage: test
-  image: rust:latest
-  script:
-    - cargo test --verbose --no-default-features --features=$FEATURES
+  extends:
+    - .test
+    - .stable
 
 rust-nightly-test:
-  stage: test
-  image: rustlang/rust:nightly
-  script:
-    - cargo test --verbose --no-default-features --features=$FEATURES
+  extends:
+    - .test
+    - .nightly
 
-"rust-latest-test with features=disable-validation":
+rust-latest-build with features=disable-validation:
+  extends: rust-latest-build
+  variables:
+    FEATURES: "disable-validation"
+
+rust-latest-test with features=disable-validation:
   extends: rust-latest-test
   variables:
     FEATURES: "disable-validation"
-
-"rust-nightly-test with features=disable-validation":
-  extends: rust-nightly-test
-  variables:
-    FEATURES: "disable-validation"
diff --git a/ChangeLog b/ChangeLog
index 43367a60..381e8933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ DATE  Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
         - Anonymous unique occupant identifiers for MUCs (XEP-0421)
     * Breaking changes:
         - Presence constructors now take Into<Jid> and assume Some.
+    * Improvements:
+        - CI: refactor, add caching
 
 Version 0.15.0:
 2019-09-06  Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>