CACHE consistency
Enable upsert (Issue #337)