More locking for cache assembly