diff --git a/cache.py b/cache.py
index 0b25061..6c1ece4 100644
--- a/cache.py
+++ b/cache.py
@@ -9,7 +9,7 @@ link_cache_system = config['config']['link_cache']
 
 DYNAMO_CACHE_TBL=None
 if link_cache_system=="dynamodb":
-    DYNAMO_CACHE_TBL=os.environ['CACHE_TABLE']
+    DYNAMO_CACHE_TBL=config['config']['table']
 
 if link_cache_system == "json":
     link_cache = {}
diff --git a/configHandler.py b/configHandler.py
index 89b714f..f507a13 100644
--- a/configHandler.py
+++ b/configHandler.py
@@ -6,7 +6,7 @@ if ('RUNNING_SERVERLESS' in os.environ and os.environ['RUNNING_SERVERLESS'] == '
             "config":{
                 "link_cache":os.environ["VXTWITTER_LINK_CACHE"],
                 "database":os.environ["VXTWITTER_DATABASE"],
-                "table":os.environ["VXTWITTER_DATABASE_TABLE"],
+                "table":os.environ["VXTWITTER_CACHE_TABLE"],
                 "method":os.environ["VXTWITTER_METHOD"], 
                 "color":os.environ["VXTWITTER_COLOR"], 
                 "appname": os.environ["VXTWITTER_APP_NAME"], 
diff --git a/serverless.yml b/serverless.yml
index fb0ddaa..79ebcd7 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -16,11 +16,10 @@ provider:
       Resource:
         - { "Fn::GetAtt": ["vxTwitterDynamoTable", "Arn" ] }
   environment:
-    CACHE_TABLE: ${self:custom.tableName}
+    VXTWITTER_CACHE_TABLE: ${self:custom.tableName}
     RUNNING_SERVERLESS: 1
     VXTWITTER_LINK_CACHE: dynamodb
     VXTWITTER_DATABASE: none
-    VXTWITTER_DATABASE_TABLE: none
     VXTWITTER_METHOD: hybrid
     VXTWITTER_COLOR: #43B581
     VXTWITTER_APP_NAME: vxTwitter