diff --git a/packages/components/nodes/llmcache/LLMInMemoryCache/LLMInMemoryCache.ts b/packages/components/nodes/cache/InMemoryCache/InMemoryCache.ts
similarity index 71%
rename from packages/components/nodes/llmcache/LLMInMemoryCache/LLMInMemoryCache.ts
rename to packages/components/nodes/cache/InMemoryCache/InMemoryCache.ts
index 44133486f..8bed721f9 100644
--- a/packages/components/nodes/llmcache/LLMInMemoryCache/LLMInMemoryCache.ts
+++ b/packages/components/nodes/cache/InMemoryCache/InMemoryCache.ts
@@ -1,8 +1,8 @@
 import { INode, INodeParams } from '../../../src/Interface'
-import { InMemoryCache } from 'langchain/cache'
+import { InMemoryCache as LangchainInMemoryCache } from 'langchain/cache'
 import { getBaseClasses } from '../../../src'
 
-class LLMInMemoryCache implements INode {
+class InMemoryCache implements INode {
     label: string
     name: string
     version: number
@@ -18,19 +18,19 @@ class LLMInMemoryCache implements INode {
         this.label = 'Local (Builtin) Cache'
         this.name = 'localCache'
         this.version = 1.0
-        this.type = 'LLMCache'
+        this.type = 'Cache'
         this.icon = 'memorycache.png'
-        this.category = 'LLM Cache'
+        this.category = 'Cache'
         this.baseClasses = [this.type, ...getBaseClasses(InMemoryCache)]
         this.inputs = []
     }
 
     async init(): Promise<any> {
         if (!this.inMemoryCache) {
-            this.inMemoryCache = InMemoryCache.global()
+            this.inMemoryCache = LangchainInMemoryCache.global()
         }
         return this.inMemoryCache
     }
 }
 
-module.exports = { nodeClass: LLMInMemoryCache }
+module.exports = { nodeClass: InMemoryCache }
diff --git a/packages/components/nodes/llmcache/LLMInMemoryCache/memorycache.png b/packages/components/nodes/cache/InMemoryCache/memorycache.png
similarity index 100%
rename from packages/components/nodes/llmcache/LLMInMemoryCache/memorycache.png
rename to packages/components/nodes/cache/InMemoryCache/memorycache.png
diff --git a/packages/components/nodes/llmcache/LLMMomentoCache/LLMMomentoCache.ts b/packages/components/nodes/cache/MomentoCache/MomentoCache.ts
similarity index 86%
rename from packages/components/nodes/llmcache/LLMMomentoCache/LLMMomentoCache.ts
rename to packages/components/nodes/cache/MomentoCache/MomentoCache.ts
index f8fd61fb9..37d909416 100644
--- a/packages/components/nodes/llmcache/LLMMomentoCache/LLMMomentoCache.ts
+++ b/packages/components/nodes/cache/MomentoCache/MomentoCache.ts
@@ -1,8 +1,8 @@
 import { getBaseClasses, getCredentialData, getCredentialParam, ICommonObject, INode, INodeData, INodeParams } from '../../../src'
-import { MomentoCache } from 'langchain/cache/momento'
+import { MomentoCache as LangchainMomentoCache } from 'langchain/cache/momento'
 import { CacheClient, Configurations, CredentialProvider } from '@gomomento/sdk'
 
-class LLMMomentoCache implements INode {
+class MomentoCache implements INode {
     label: string
     name: string
     version: number
@@ -18,9 +18,9 @@ class LLMMomentoCache implements INode {
         this.label = 'Momento Cache'
         this.name = 'momentoCache'
         this.version = 1.0
-        this.type = 'LLMCache'
+        this.type = 'Cache'
         this.icon = 'momento.png'
-        this.category = 'LLM Cache'
+        this.category = 'Cache'
         this.baseClasses = [this.type, ...getBaseClasses(MomentoCache)]
         this.credential = {
             label: 'Connect Credential',
@@ -47,7 +47,7 @@ class LLMMomentoCache implements INode {
             defaultTtlSeconds: 60 * 60 * 24
         })
 
-        let momentoCache = await MomentoCache.fromProps({
+        let momentoCache = await LangchainMomentoCache.fromProps({
             client,
             cacheName: cacheName
         })
@@ -55,4 +55,4 @@ class LLMMomentoCache implements INode {
     }
 }
 
-module.exports = { nodeClass: LLMMomentoCache }
+module.exports = { nodeClass: MomentoCache }
diff --git a/packages/components/nodes/llmcache/LLMMomentoCache/momento.png b/packages/components/nodes/cache/MomentoCache/momento.png
similarity index 100%
rename from packages/components/nodes/llmcache/LLMMomentoCache/momento.png
rename to packages/components/nodes/cache/MomentoCache/momento.png
diff --git a/packages/components/nodes/llmcache/LLMRedisCache/LLMRedisCache.ts b/packages/components/nodes/cache/RedisCache/RedisCache.ts
similarity index 85%
rename from packages/components/nodes/llmcache/LLMRedisCache/LLMRedisCache.ts
rename to packages/components/nodes/cache/RedisCache/RedisCache.ts
index a72089770..d0143d760 100644
--- a/packages/components/nodes/llmcache/LLMRedisCache/LLMRedisCache.ts
+++ b/packages/components/nodes/cache/RedisCache/RedisCache.ts
@@ -1,8 +1,8 @@
 import { getBaseClasses, getCredentialData, getCredentialParam, ICommonObject, INode, INodeData, INodeParams } from '../../../src'
-import { RedisCache } from 'langchain/cache/ioredis'
+import { RedisCache as LangchainRedisCache } from 'langchain/cache/ioredis'
 import { Redis } from 'ioredis'
 
-class LLMRedisCache implements INode {
+class RedisCache implements INode {
     label: string
     name: string
     version: number
@@ -18,9 +18,9 @@ class LLMRedisCache implements INode {
         this.label = 'Redis LLM Cache'
         this.name = 'redisCache'
         this.version = 1.0
-        this.type = 'LLMCache'
+        this.type = 'Cache'
         this.icon = 'redis.svg'
-        this.category = 'LLM Cache'
+        this.category = 'Cache'
         this.baseClasses = [this.type, ...getBaseClasses(RedisCache)]
         this.credential = {
             label: 'Connect Credential',
@@ -45,8 +45,8 @@ class LLMRedisCache implements INode {
             username,
             password
         })
-        return new RedisCache(client)
+        return new LangchainRedisCache(client)
     }
 }
 
-module.exports = { nodeClass: LLMRedisCache }
+module.exports = { nodeClass: RedisCache }
diff --git a/packages/components/nodes/llmcache/LLMRedisCache/redis.svg b/packages/components/nodes/cache/RedisCache/redis.svg
similarity index 100%
rename from packages/components/nodes/llmcache/LLMRedisCache/redis.svg
rename to packages/components/nodes/cache/RedisCache/redis.svg
diff --git a/packages/components/nodes/llmcache/LLMUpstashRedisCache/LLMUpstashRedisCache.ts b/packages/components/nodes/cache/UpstashRedisCache/UpstashRedisCache.ts
similarity index 82%
rename from packages/components/nodes/llmcache/LLMUpstashRedisCache/LLMUpstashRedisCache.ts
rename to packages/components/nodes/cache/UpstashRedisCache/UpstashRedisCache.ts
index 8914b2a11..a9322b1eb 100644
--- a/packages/components/nodes/llmcache/LLMUpstashRedisCache/LLMUpstashRedisCache.ts
+++ b/packages/components/nodes/cache/UpstashRedisCache/UpstashRedisCache.ts
@@ -1,7 +1,7 @@
 import { getBaseClasses, getCredentialData, getCredentialParam, ICommonObject, INode, INodeData, INodeParams } from '../../../src'
-import { UpstashRedisCache } from 'langchain/cache/upstash_redis'
+import { UpstashRedisCache as LangchainUpstashRedisCache } from 'langchain/cache/upstash_redis'
 
-class LLMUpstashRedisCache implements INode {
+class UpstashRedisCache implements INode {
     label: string
     name: string
     version: number
@@ -17,9 +17,9 @@ class LLMUpstashRedisCache implements INode {
         this.label = 'Upstash Redis LLM Cache'
         this.name = 'upstashRedisCache'
         this.version = 1.0
-        this.type = 'LLMCache'
+        this.type = 'Cache'
         this.icon = 'upstash.png'
-        this.category = 'LLM Cache'
+        this.category = 'Cache'
         this.baseClasses = [this.type, ...getBaseClasses(UpstashRedisCache)]
         this.credential = {
             label: 'Connect Credential',
@@ -36,7 +36,7 @@ class LLMUpstashRedisCache implements INode {
         const upstashConnectionUrl = getCredentialParam('upstashConnectionUrl', credentialData, nodeData)
         const upstashToken = getCredentialParam('upstashConnectionToken', credentialData, nodeData)
 
-        const cache = new UpstashRedisCache({
+        const cache = new LangchainUpstashRedisCache({
             config: {
                 url: upstashConnectionUrl,
                 token: upstashToken
@@ -46,4 +46,4 @@ class LLMUpstashRedisCache implements INode {
     }
 }
 
-module.exports = { nodeClass: LLMUpstashRedisCache }
+module.exports = { nodeClass: UpstashRedisCache }
diff --git a/packages/components/nodes/llmcache/LLMUpstashRedisCache/upstash.png b/packages/components/nodes/cache/UpstashRedisCache/upstash.png
similarity index 100%
rename from packages/components/nodes/llmcache/LLMUpstashRedisCache/upstash.png
rename to packages/components/nodes/cache/UpstashRedisCache/upstash.png