AG-3851: little refactoring, properties and jedis is back