diff --git a/.env.example b/.env.example
index 8e459397..4af6c61a 100644
--- a/.env.example
+++ b/.env.example
@@ -53,7 +53,8 @@ MYSQL_PASSWORD=vichan!
 MYSQL_ROOT_PASSWORD=vichan!!
 
 
-# Redis
-VICHAN_REDIS_HOST=redis
-VICHAN_REDIS_PORT=6379
-VICHAN_REDIS_PASSWORD=redis!
+# Cache Settings
+VICHAN_CACHE_ENGINE=redis
+VICHAN_CACHE_HOST=redis
+VICHAN_CACHE_PORT=6379
+VICHAN_CACHE_PASSWORD=redis!
diff --git a/compose.yml b/compose.yml
index 49809abe..2e7077df 100644
--- a/compose.yml
+++ b/compose.yml
@@ -39,10 +39,11 @@ services:
       VICHAN_MYSQL_PASSWORD: ${VICHAN_MYSQL_PASSWORD}
       # Security
       VICHAN_SECURE_LOGIN_ONLY: ${VICHAN_SECURE_LOGIN_ONLY}
-      # Redis settings
-      VICHAN_REDIS_HOST: ${VICHAN_REDIS_HOST}
-      VICHAN_REDIS_PORT: ${VICHAN_REDIS_PORT}
-      VICHAN_REDIS_PASSWORD: ${VICHAN_REDIS_PASSWORD}
+      # Cache settings
+      VICHAN_CACHE_ENGINE: ${VICHAN_CACHE_ENGINE}
+      VICHAN_CACHE_HOST: ${VICHAN_CACHE_HOST}
+      VICHAN_CACHE_PORT: ${VICHAN_CACHE_PORT}
+      VICHAN_CACHE_PASSWORD: ${VICHAN_CACHE_PASSWORD}
       # Cookies
       VICHAN_COOKIES_MOD: ${VICHAN_COOKIES_MOD}
       # Flood Control
@@ -88,10 +89,10 @@ services:
     volumes:
       - ./local-instances/${INSTANCE:-0}/redis:/data
     environment:
-      REDIS_PASSWORD: ${VICHAN_REDIS_PASSWORD}
-    command: redis-server --requirepass ${VICHAN_REDIS_PASSWORD}
+      REDIS_PASSWORD: ${VICHAN_CACHE_PASSWORD}
+    command: redis-server --requirepass ${VICHAN_CACHE_PASSWORD}
     healthcheck:
-      test: ["CMD", "redis-cli", "-a", "${VICHAN_REDIS_PASSWORD}", "ping"]
+      test: ["CMD", "redis-cli", "-a", "${VICHAN_CACHE_PASSWORD}", "ping"]
       interval: 10s
       timeout: 5s
       retries: 5