CON-768 | changes after CR, add cache layer, bugfixes