Fix race condition when tracking keys that have already been seen

Fix race condition when tracking keys that have already been seen #385