cache.add() incorrectly succeeded when there was an existing key with an infinite (None) timeout. Backport of af5f688392 from master.
cache.add() incorrectly succeeded when there was an existing key with an infinite (None) timeout. Backport of af5f688392 from master.