diff --git a/src/system/kernel/slab/HashedObjectCache.cpp b/src/system/kernel/slab/HashedObjectCache.cpp
index 0d8dc20b1b..bca3f361b6 100644
--- a/src/system/kernel/slab/HashedObjectCache.cpp
+++ b/src/system/kernel/slab/HashedObjectCache.cpp
@@ -157,11 +157,14 @@ HashedObjectCache::ReturnSlab(slab* _slab, uint32 flags)
 slab*
 HashedObjectCache::ObjectSlab(void* object) const
 {
+	ASSERT_LOCKED_MUTEX(&lock);
+
 	HashedSlab* slab = hash_table.Lookup(::lower_boundary(object, slab_size));
 	if (slab == NULL) {
 		panic("hash object cache %p: unknown object %p", this, object);
 		return NULL;
 	}
+
 	return slab;
 }
 
diff --git a/src/system/kernel/slab/Slab.cpp b/src/system/kernel/slab/Slab.cpp
index d9c62278d5..59925dd5e4 100644
--- a/src/system/kernel/slab/Slab.cpp
+++ b/src/system/kernel/slab/Slab.cpp
@@ -823,6 +823,7 @@ add_alloc_tracing_entry(ObjectCache* cache, uint32 flags, void* object)
 {
 #if SLAB_OBJECT_CACHE_TRACING
 #if SLAB_OBJECT_CACHE_ALLOCATION_TRACKING
+	MutexLocker _(cache->lock);
 	cache->TrackingInfoFor(object)->Init(T(Alloc(cache, flags, object)));
 #else
 	T(Alloc(cache, flags, object));
@@ -1220,7 +1221,7 @@ object_cache_alloc(object_cache* cache, uint32 flags)
 		}
 	}
 
-	MutexLocker _(cache->lock);
+	MutexLocker locker(cache->lock);
 	slab* source = NULL;
 
 	while (true) {
@@ -1264,6 +1265,8 @@ object_cache_alloc(object_cache* cache, uint32 flags)
 	}
 
 	void* object = link_to_object(link, cache->object_size);
+	locker.Unlock();
+
 	add_alloc_tracing_entry(cache, flags, object);
 	return fill_allocated_block(object, cache->object_size);
 }
@@ -1295,7 +1298,9 @@ object_cache_free(object_cache* cache, void* object, uint32 flags)
 #endif
 
 #if SLAB_OBJECT_CACHE_ALLOCATION_TRACKING
+	mutex_lock(&cache->lock);
 	cache->TrackingInfoFor(object)->Clear();
+	mutex_unlock(&cache->lock);
 #endif
 
 	if ((cache->flags & CACHE_NO_DEPOT) == 0) {