Redis improvements from Paul Morel