diff --git a/src/main/java/org/geysermc/connect/GeyserConnectConfig.java b/src/main/java/org/geysermc/connect/GeyserConnectConfig.java
index b27a8b9..a0b290e 100644
--- a/src/main/java/org/geysermc/connect/GeyserConnectConfig.java
+++ b/src/main/java/org/geysermc/connect/GeyserConnectConfig.java
@@ -74,8 +74,11 @@ public class GeyserConnectConfig {
 
         private int port;
 
+        @JsonProperty("cache-chunks")
+        private boolean cacheChunks = true;
+
         @JsonProperty("allow-password-authentication")
-        private boolean allowPasswordAuthentication = true;
+        private boolean allowPasswordAuthentication = false;
 
         @JsonProperty("debug-mode")
         private boolean debugMode;
diff --git a/src/main/java/org/geysermc/connect/proxy/GeyserProxyBootstrap.java b/src/main/java/org/geysermc/connect/proxy/GeyserProxyBootstrap.java
index ee6c968..faef11c 100644
--- a/src/main/java/org/geysermc/connect/proxy/GeyserProxyBootstrap.java
+++ b/src/main/java/org/geysermc/connect/proxy/GeyserProxyBootstrap.java
@@ -71,6 +71,7 @@ public class GeyserProxyBootstrap implements GeyserBootstrap {
             text = text.replace("PORT", String.valueOf(multiConfig.getGeyser().getPort()));
             text = text.replaceAll("MOTD", multiConfig.getMotd());
             text = text.replace("PLAYERS", String.valueOf(multiConfig.getMaxPlayers()));
+            text = text.replace("CACHECHUNKS", String.valueOf(multiConfig.getGeyser().isCacheChunks()));
             text = text.replace("ALLOWPASSWORDAUTHENTICATION", String.valueOf(multiConfig.getGeyser().isAllowPasswordAuthentication()));
 
             ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 851d34f..91ce45d 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -25,8 +25,11 @@ geyser:
   # The port that will listen for connections
   port: 19133
 
+  # Configures if chunk caching should be enabled or not.
+  cache-chunks: true
+
   # If password authentication should be allowed in online mode.
-  allow-password-authentication: true
+  allow-password-authentication: false
 
   # If debug messages should be sent through console, has to be enabled in both places to work
   debug-mode: false
diff --git a/src/main/resources/proxy_config.yml b/src/main/resources/proxy_config.yml
index 71c37f4..72ab933 100644
--- a/src/main/resources/proxy_config.yml
+++ b/src/main/resources/proxy_config.yml
@@ -101,7 +101,7 @@ show-cooldown: true
 # up a lot of RAM. However, when using the Spigot version of Geyser, support for features
 # or implementations this allows is automatically enabled without the additional caching as
 # Geyser has direct access to the server itself.
-cache-chunks: false
+cache-chunks: CACHECHUNKS
 
 # Specify how many days images will be cached to disk to save downloading them from the internet.
 # A value of 0 is disabled. (Default: 0)