diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index abe4b7ca53..f636247603 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -27,7 +27,7 @@ jobs:
         uses:                 ruby/setup-ruby@v1
         with:
           ruby-version:       '2.7'
-          bundler-cache:      false
+          bundler-cache:      true
 
       - name:                 Setup - Xcode
         uses:                 maxim-lobanov/setup-xcode@v1
@@ -39,13 +39,13 @@ jobs:
           brew install sourcery
           bundle install
 
-      # - name: Get cached Swift Packages managed by Xcode
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
-      #     key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-spm-
+      - name: Get cached Swift Packages managed by Xcode
+        uses: actions/cache@v3
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
+          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-spm-
 
       - name:                 Install Rust targets
         uses:                 dtolnay/rust-toolchain@stable
@@ -58,12 +58,12 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 Build iOS and run tests
         shell:                bash
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index 7bda8b0c7b..9ac6abe60e 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -38,7 +38,7 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
       - name:           Install additional rust targets
         run:            rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
@@ -46,20 +46,20 @@ jobs:
       - name:           Install Android Dependencies
         uses:           ./.github/actions/install-android-dep
 
-      # - name:           Rust Cache
-      #   uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:   rust -> rust/target
-
-      # - name:           Gradle Cache
-      #   uses:           actions/cache@v3
-      #   with:
-      #     path:         |
-      #       ~/.gradle/caches
-      #       ~/.gradle/wrapper
-      #     key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-gradle-
+      - name:           Rust Cache
+        uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:   rust -> rust/target
+
+      - name:           Gradle Cache
+        uses:           actions/cache@v3
+        with:
+          path:         |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       - name:           Build
         run:            |
@@ -92,7 +92,7 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
       - name:           Install additional rust targets
         run:            rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
@@ -100,20 +100,20 @@ jobs:
       - name:           Install Android Dependencies
         uses:           ./.github/actions/install-android-dep
 
-      # - name:           Rust Cache
-      #   uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:   rust -> rust/target
-
-      # - name:           Gradle Cache
-      #   uses:           actions/cache@v3
-      #   with:
-      #     path:         |
-      #       ~/.gradle/caches
-      #       ~/.gradle/wrapper
-      #     key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-gradle-
+      - name:           Rust Cache
+        uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:   rust -> rust/target
+
+      - name:           Gradle Cache
+        uses:           actions/cache@v3
+        with:
+          path:         |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       - name:           Assemble unsigned debug apk
         run:            |
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index e01880829b..e1200f1199 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
       - name:           Install additional rust targets
         run:            rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
@@ -42,20 +42,20 @@ jobs:
       - name:           Install Android Dependencies
         uses:           ./.github/actions/install-android-dep
 
-      # - name:           Rust Cache
-      #   uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:   rust -> rust/target
-
-      # - name:           Gradle Cache
-      #   uses:           actions/cache@v3
-      #   with:
-      #     path:         |
-      #       ~/.gradle/caches
-      #       ~/.gradle/wrapper
-      #     key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-gradle-
+      - name:           Rust Cache
+        uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:   rust -> rust/target
+
+      - name:           Gradle Cache
+        uses:           actions/cache@v3
+        with:
+          path:         |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       - name:           Build
         run:            |
@@ -88,7 +88,7 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
       - name:           Install additional rust targets
         run:            rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
@@ -96,20 +96,20 @@ jobs:
       - name:           Install Android Dependencies
         uses:           ./.github/actions/install-android-dep
 
-      # - name:           Rust Cache
-      #   uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:   rust -> rust/target
-
-      # - name:           Gradle Cache
-      #   uses:           actions/cache@v3
-      #   with:
-      #     path:         |
-      #       ~/.gradle/caches
-      #       ~/.gradle/wrapper
-      #     key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-gradle-
+      - name:           Rust Cache
+        uses:           Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:   rust -> rust/target
+
+      - name:           Gradle Cache
+        uses:           actions/cache@v3
+        with:
+          path:         |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       # Build and publish
 
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index b7b0aaa1c7..f698f8db70 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -33,10 +33,10 @@ jobs:
       - name:                 Install Rust stable toolchain
         uses:                 dtolnay/rust-toolchain@stable
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 Install cargo-spellcheck
         uses:                 baptiste0928/cargo-install@1cd874a5478fdca35d868ccc74640c5aabbb8f1b # v3.0.0
@@ -48,7 +48,7 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
       - name:                 Run spellcheck
         run:                  |
diff --git a/.github/workflows/rust-clippy.yml b/.github/workflows/rust-clippy.yml
index fc5ab9ca98..807d9c0ccb 100644
--- a/.github/workflows/rust-clippy.yml
+++ b/.github/workflows/rust-clippy.yml
@@ -37,12 +37,12 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 cargo clippy
         run:                  |
diff --git a/.github/workflows/rust-test-android.yml b/.github/workflows/rust-test-android.yml
index 473789c78c..c8161c3c54 100644
--- a/.github/workflows/rust-test-android.yml
+++ b/.github/workflows/rust-test-android.yml
@@ -43,12 +43,12 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 cargo nextest
         run:                  |
diff --git a/.github/workflows/rust-test-ios.yml b/.github/workflows/rust-test-ios.yml
index 8f17d46955..4cd50af612 100644
--- a/.github/workflows/rust-test-ios.yml
+++ b/.github/workflows/rust-test-ios.yml
@@ -40,12 +40,12 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 cargo nextest
         shell:                bash
diff --git a/.github/workflows/testflight-prod.yml b/.github/workflows/testflight-prod.yml
index 138ae8b41d..efb4aea4ef 100644
--- a/.github/workflows/testflight-prod.yml
+++ b/.github/workflows/testflight-prod.yml
@@ -22,7 +22,7 @@ jobs:
         uses:                 ruby/setup-ruby@v1
         with:
           ruby-version:       '2.7'
-          bundler-cache:      false
+          bundler-cache:      true
 
       - name:                 Setup - Xcode
         uses:                 maxim-lobanov/setup-xcode@v1
@@ -34,13 +34,13 @@ jobs:
           brew install sourcery
           bundle install
 
-      # - name: Get cached Swift Packages managed by Xcode
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
-      #     key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-spm-
+      - name: Get cached Swift Packages managed by Xcode
+        uses: actions/cache@v3
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
+          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-spm-
 
       - name:                 Install Rust targets
         uses:                 dtolnay/rust-toolchain@stable
@@ -53,12 +53,12 @@ jobs:
         with:
           crate:              uniffi_bindgen
           version:            0.22.0 # Must be in sync with version in Cargo.toml
-          use-tool-cache:     false
+          use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 Install the Apple certificate and provisioning profile
         env:
diff --git a/.github/workflows/testflight-qa.yml b/.github/workflows/testflight-qa.yml
index 216217b00d..ee0019c11f 100644
--- a/.github/workflows/testflight-qa.yml
+++ b/.github/workflows/testflight-qa.yml
@@ -22,7 +22,7 @@ jobs:
         uses:                 ruby/setup-ruby@v1
         with:
           ruby-version:       '2.7'
-          bundler-cache:      false
+          bundler-cache:      true
 
       - name:                 Setup - Xcode
         uses:                 maxim-lobanov/setup-xcode@v1
@@ -34,13 +34,13 @@ jobs:
           brew install sourcery
           bundle install
 
-      # - name: Get cached Swift Packages managed by Xcode
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
-      #     key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-spm-
+      - name: Get cached Swift Packages managed by Xcode
+        uses: actions/cache@v3
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
+          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-spm-
 
       - name:                 Install Rust targets
         uses:                 dtolnay/rust-toolchain@stable
@@ -55,10 +55,10 @@ jobs:
           version:            0.22.0 # Must be in sync with version in Cargo.toml
           use-tool-cache:     true
 
-      # - name:                 Rust Cache
-      #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
-      #   with:
-      #     workspaces:         rust -> rust/target
+      - name:                 Rust Cache
+        uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
+        with:
+          workspaces:         rust -> rust/target
 
       - name:                 Install the Apple certificate and provisioning profile
         env: