removed unnecessary locking on immutable context