diff --git a/core/src/main/kotlin/app/dapk/st/core/LRUCache.kt b/core/src/main/kotlin/app/dapk/st/core/LRUCache.kt
new file mode 100644
index 0000000..373d0ca
--- /dev/null
+++ b/core/src/main/kotlin/app/dapk/st/core/LRUCache.kt
@@ -0,0 +1,27 @@
+package app.dapk.st.core
+
+class LRUCache<K, V>(val maxSize: Int) {
+
+    private val internalCache = object : LinkedHashMap<K, V>(0, 0.75f, true) {
+        override fun removeEldestEntry(eldest: MutableMap.MutableEntry<K, V>?): Boolean {
+            return size > maxSize
+        }
+    }
+
+    fun put(key: K, value: V) {
+        internalCache[key] = value
+    }
+
+    fun get(key: K): V? {
+        return internalCache[key]
+    }
+
+    fun getOrPut(key: K, value: () -> V): V {
+        return get(key) ?: value().also { put(key, it) }
+    }
+
+    fun size() = internalCache.size
+
+}
+
+fun LRUCache<*, *>?.isNullOrEmpty() = this == null || this.size() == 0
\ No newline at end of file
diff --git a/matrix/services/room/build.gradle b/matrix/services/room/build.gradle
index 3dcc229..eaa3259 100644
--- a/matrix/services/room/build.gradle
+++ b/matrix/services/room/build.gradle
@@ -1 +1,5 @@
 applyMatrixServiceModule(project)
+
+dependencies {
+    implementation project(":core")
+}
\ No newline at end of file
diff --git a/matrix/services/room/src/main/kotlin/app/dapk/st/matrix/room/internal/RoomMembers.kt b/matrix/services/room/src/main/kotlin/app/dapk/st/matrix/room/internal/RoomMembers.kt
index 3ee369d..c3a9aff 100644
--- a/matrix/services/room/src/main/kotlin/app/dapk/st/matrix/room/internal/RoomMembers.kt
+++ b/matrix/services/room/src/main/kotlin/app/dapk/st/matrix/room/internal/RoomMembers.kt
@@ -1,5 +1,7 @@
 package app.dapk.st.matrix.room.internal
 
+import app.dapk.st.core.LRUCache
+import app.dapk.st.core.isNullOrEmpty
 import app.dapk.st.matrix.common.RoomId
 import app.dapk.st.matrix.common.RoomMember
 import app.dapk.st.matrix.common.UserId
@@ -18,7 +20,7 @@ class RoomMembers(private val memberStore: MemberStore, private val membersCache
             memberStore.query(roomId, userIds).also { membersCache.insert(roomId, it) }
         } else {
             val (cachedMembers, missingIds) = userIds.fold(mutableListOf<RoomMember>() to mutableListOf<UserId>()) { acc, current ->
-                when (val member = roomCache[current]) {
+                when (val member = roomCache?.get(current)) {
                     null -> acc.second.add(current)
                     else -> acc.first.add(member)
                 }
@@ -42,12 +44,12 @@ class RoomMembers(private val memberStore: MemberStore, private val membersCache
 
 class RoomMembersCache {
 
-    private val cache = mutableMapOf<RoomId, MutableMap<UserId, RoomMember>>()
+    private val cache = LRUCache<RoomId, LRUCache<UserId, RoomMember>>(maxSize = 12)
 
-    fun room(roomId: RoomId) = cache[roomId]
+    fun room(roomId: RoomId) = cache.get(roomId)
 
     fun insert(roomId: RoomId, members: List<RoomMember>) {
-        val map = cache.getOrPut(roomId) { mutableMapOf() }
-        members.forEach { map[it.id] = it }
+        val map = cache.getOrPut(roomId) { LRUCache(maxSize = 25) }
+        members.forEach { map.put(it.id, it) }
     }
-}
\ No newline at end of file
+}