Don't create duplicate entries with stale data

Fixes #14