FIX: simplify, use our redis instead