CDB-3306 Added redis caching + one bugfix