Stop depending on redis directly