SIT-1347 used redis a bit better