diff --git a/api/main.py b/api/main.py
index 2ffea6e..3a63477 100644
--- a/api/main.py
+++ b/api/main.py
@@ -63,7 +63,7 @@ from utils_v2.api.async_quart import (
 from utils_v2.goog.controllers.gmail.gmail_client import AsyncGMailClient
 
 # Core Controller Models:
-# from controllers.core.message import CoreMessageController
+from controllers.core.message import CoreMessageController
 from controllers.core.auth_token import CoreAuthTokenController
 from controllers.core.ai.llm import CoreLLMController
 from controllers.core.payment import CorePaymentController
@@ -74,7 +74,7 @@ from controllers.api.mail import MailController
 from controllers.api.payment import PaymentController
 
 # Controllers V2:
-from controllers_v2.core.message import CoreMessageController
+# from controllers_v2.core.message import CoreMessageController
 from controllers_v2.sms.all_sms import AllSMSController
 from controllers_v2.sms.nimbus_sms_india import NimbusSMSIndiaController
 from controllers_v2.sms.savvy_bulk_sms_kenya import SavvyBulkSMSKenyaController
@@ -408,21 +408,24 @@ async def app_startup(**kwargs):
     # ┃ ┏┓┏┓╋┏┓┏┓┃┃┏┓┏┓┏  ┃┃┏┛
     # ┗┛┗┛┛┗┗┛ ┗┛┗┗┗ ┛ ┛  ┗┛┗━
 
-    # Auth-Token Controller(s):
-    current_app.core_auth_token_controller = CoreAuthTokenController()
+    # # Auth-Token Controller(s):
+    # current_app.core_auth_token_controller = CoreAuthTokenController()
 
     # SMS Controllers:
     current_app.sms_controller = AllSMSController(
+        cache = current_app.module_cache,
         http_client = current_app.http_client,
         alert_url = current_app.script_data["alerts"]["url"],
         debug = enable_debugging
     )
     current_app.nimbus_sms_india_controller = NimbusSMSIndiaController(
+        cache = current_app.module_cache,
         http_client = current_app.http_client,
         alert_url = current_app.script_data["alerts"]["url"],
         debug = enable_debugging
     )
     current_app.savvy_bulk_sms_kenya_controller = SavvyBulkSMSKenyaController(
+        cache = current_app.module_cache,
         http_client = current_app.http_client,
         alert_url = current_app.script_data["alerts"]["url"],
         debug = enable_debugging
diff --git a/controllers/api/mail.py b/controllers/api/mail.py
index 90d1062..c77f6b5 100644
--- a/controllers/api/mail.py
+++ b/controllers/api/mail.py
@@ -732,7 +732,7 @@ class MailController:
 
         # Simply call the core model:
         return await current_app.core_message_controller.get_message(
-            mongo_conn = mongo_conn,
+            mongo_data_conn = mongo_conn,
             message_id = message_id
         )