Cherry-pick dalli-elasticache fix to master