Issue #1 and swapped to RedisStore