15 Commits (fix-cache-key-collisions)