diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml
index 5ca6131a4..98992d51f 100644
--- a/aider/website/assets/sample.aider.conf.yml
+++ b/aider/website/assets/sample.aider.conf.yml
@@ -92,6 +92,12 @@
 ## Max number of tokens to use for repo map, use 0 to disable (default: 1024)
 #map-tokens:
 
+## Control when the repo map is refreshed (default: auto)
+#map-refresh: auto
+
+## Enable caching of prompts (forces map_refresh='files') (default: False)
+#cache-prompts: false
+
 ## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
 #max-chat-history-tokens:
 
diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env
index cd1f49c44..98d89f550 100644
--- a/aider/website/assets/sample.env
+++ b/aider/website/assets/sample.env
@@ -96,6 +96,12 @@
 ## Max number of tokens to use for repo map, use 0 to disable (default: 1024)
 #AIDER_MAP_TOKENS=
 
+## Control when the repo map is refreshed (default: auto)
+#AIDER_MAP_REFRESH=auto
+
+## Enable caching of prompts (forces map_refresh='files') (default: False)
+#AIDER_CACHE_PROMPTS=false
+
 ## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
 #AIDER_MAX_CHAT_HISTORY_TOKENS=
 
diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md
index d3dfe6887..66526fb50 100644
--- a/aider/website/docs/config/aider_conf.md
+++ b/aider/website/docs/config/aider_conf.md
@@ -131,6 +131,12 @@ cog.outl("```")
 ## Max number of tokens to use for repo map, use 0 to disable (default: 1024)
 #map-tokens:
 
+## Control when the repo map is refreshed (default: auto)
+#map-refresh: auto
+
+## Enable caching of prompts (forces map_refresh='files') (default: False)
+#cache-prompts: false
+
 ## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
 #max-chat-history-tokens:
 
diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md
index de1434641..db7edead2 100644
--- a/aider/website/docs/config/dotenv.md
+++ b/aider/website/docs/config/dotenv.md
@@ -138,6 +138,12 @@ cog.outl("```")
 ## Max number of tokens to use for repo map, use 0 to disable (default: 1024)
 #AIDER_MAP_TOKENS=
 
+## Control when the repo map is refreshed (default: auto)
+#AIDER_MAP_REFRESH=auto
+
+## Enable caching of prompts (forces map_refresh='files') (default: False)
+#AIDER_CACHE_PROMPTS=false
+
 ## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
 #AIDER_MAX_CHAT_HISTORY_TOKENS=
 
diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md
index bdfadbdd4..4ca48e5f9 100644
--- a/aider/website/docs/config/options.md
+++ b/aider/website/docs/config/options.md
@@ -34,7 +34,9 @@ usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model]
              [--verify-ssl | --no-verify-ssl] [--edit-format]
              [--weak-model]
              [--show-model-warnings | --no-show-model-warnings]
-             [--map-tokens] [--max-chat-history-tokens] [--env-file]
+             [--map-tokens] [--map-refresh]
+             [--cache-prompts | --no-cache-prompts]
+             [--max-chat-history-tokens] [--env-file]
              [--input-history-file] [--chat-history-file]
              [--restore-chat-history | --no-restore-chat-history]
              [--llm-history-file] [--dark-mode] [--light-mode]
@@ -189,6 +191,19 @@ Aliases:
 Max number of tokens to use for repo map, use 0 to disable (default: 1024)  
 Environment variable: `AIDER_MAP_TOKENS`  
 
+### `--map-refresh VALUE`
+Control when the repo map is refreshed (default: auto)  
+Default: auto  
+Environment variable: `AIDER_MAP_REFRESH`  
+
+### `--cache-prompts`
+Enable caching of prompts (forces map_refresh='files') (default: False)  
+Default: False  
+Environment variable: `AIDER_CACHE_PROMPTS`  
+Aliases:
+  - `--cache-prompts`
+  - `--no-cache-prompts`
+
 ### `--max-chat-history-tokens VALUE`
 Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.  
 Environment variable: `AIDER_MAX_CHAT_HISTORY_TOKENS`  
diff --git a/aider/website/docs/usage/commands.md b/aider/website/docs/usage/commands.md
index 30e9c6461..ff99d5cf7 100644
--- a/aider/website/docs/usage/commands.md
+++ b/aider/website/docs/usage/commands.md
@@ -29,6 +29,7 @@ cog.out(get_help_md())
 | **/lint** | Lint and fix provided files or in-chat files if none provided |
 | **/ls** | List all known files and indicate which are included in the chat session |
 | **/map** | Print out the current repository map |
+| **/map-refresh** | Force a refresh of the repository map and print it out |
 | **/model** | Switch to a new LLM |
 | **/models** | Search the list of available models |
 | **/quit** | Exit the application |