diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
index 6e9f2c612f0..f302d02f151 100644
--- a/.github/workflows/acceptance.yml
+++ b/.github/workflows/acceptance.yml
@@ -169,7 +169,7 @@ jobs:
         run: moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
         env:
           DB: pgsql
-          MOODLE_BRANCH: ${{ github.event.inputs.moodle_branch || 'MOODLE_500_STABLE' }} # TODO: Use 'main' once MDL-85632 is fixed.
+          MOODLE_BRANCH: ${{ github.event.inputs.moodle_branch || 'main' }}
           MOODLE_REPO: ${{ github.event.inputs.moodle_repository || 'https://github.com/moodle/moodle.git' }}
           MOODLE_BEHAT_IONIC_WWWROOT: https://localhost:8001
           MOODLE_BEHAT_DEFAULT_BROWSER: chrome
diff --git a/src/core/classes/sites/authenticated-site.ts b/src/core/classes/sites/authenticated-site.ts
index 505083d6110..9d1e2dbf91f 100644
--- a/src/core/classes/sites/authenticated-site.ts
+++ b/src/core/classes/sites/authenticated-site.ts
@@ -737,7 +737,11 @@ export class CoreAuthenticatedSite extends CoreUnauthenticatedSite {
 
                 if (preSets.saveToCache) {
                     // Save the error instead of deleting the cache entry so the same content is displayed in offline.
-                    this.saveToCache(method, data, error, preSets);
+                    // Create a new error object when storing, otherwise the message is not stored with CoreWSError.
+                    this.saveToCache(method, data, {
+                        ...error,
+                        message: error.message,
+                    }, preSets);
                 }
 
                 throw new CoreWSError(error);