A little more locking during cache assembly