Agreed. I'd rather do that in a separate PR, though, because we need to be careful about how we construct and cache FakeRedis instances for the cases where we actually need two different Redis instances (which we don't test yet but probably should).