Per-entry locks maybe working? Need to test further.