diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 6fa814afff..0cbc4b6ea2 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -82,6 +82,8 @@ Interface changes
     - change `--slang` default from blank to `auto`
     - add `--input-cursor-passthrough` option to allow pointer events to completely
       passthrough the mpv window
+    - icc and gpu-shader cache are now saved by default (use --no-icc-shader-cache and
+      --no-gpu-shader-cache to disable)
  --- mpv 0.35.0 ---
     - add the `--vo=gpu-next` video output driver, as well as the options
       `--allow-delayed-peak-detect`, `--builtin-scalers`,
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index acdf098585..6a08a2d5b6 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -6720,10 +6720,10 @@ them.
 
 ``--icc-cache``
     Store and load 3D LUTs created from the ICC profile on disk in the
-    cache directory. This can be used to speed up loading, since LittleCMS
-    2 can take a while to create a 3D LUT. Note that these files contain
-    uncompressed LUTs. Their size depends on the ``--icc-3dlut-size``, and
-    can be very big.
+    cache directory (Default: ``yes``). This can be used to speed up loading,
+    since LittleCMS 2 can take a while to create a 3D LUT. Note that these
+    files contain uncompressed LUTs. Their size depends on the
+    ``--icc-3dlut-size``, and can be very big.
 
     NOTE: This is not cleaned automatically, so old, unused cache files may
     stick around indefinitely.
@@ -6868,11 +6868,11 @@ them.
     This option might be silently removed in the future.
 
 ``--gpu-shader-cache``
-    Store and load compiled GLSL shaders in the cache directory. Normally, shader
-    compilation is very fast, so this is not usually needed. It mostly matters
-    for GPU APIs that require internally recompiling shaders to other languages,
-    for example anything based on ANGLE or Vulkan. Enabling this can improve
-    startup performance on these platforms.
+    Store and load compiled GLSL shaders in the cache directory (Default: ``yes``).
+    Normally, shader compilation is very fast, so this is not usually needed.
+    It mostly matters for GPU APIs that require internally recompiling shaders to
+    other languages, for example anything based on ANGLE or Vulkan. Enabling this
+    can improve startup performance on these platforms.
 
     NOTE: This is not cleaned automatically, so old, unused cache files may
     stick around indefinitely.
diff --git a/video/out/gpu/lcms.c b/video/out/gpu/lcms.c
index 0ff4de8344..7880f279e6 100644
--- a/video/out/gpu/lcms.c
+++ b/video/out/gpu/lcms.c
@@ -516,5 +516,6 @@ const struct m_sub_options mp_icc_conf = {
         .size_str = "64x64x64",
         .intent = MP_INTENT_RELATIVE_COLORIMETRIC,
         .use_embedded = true,
+        .cache = true,
     },
 };
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index 4ca5428098..d961002e7b 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -327,6 +327,7 @@ static const struct gl_video_opts gl_video_opts_def = {
         .scene_threshold_high = 10.0,
     },
     .early_flush = -1,
+    .shader_cache = true,
     .hwdec_interop = "auto",
 };