CON-1130 | fix for overwriting cache on set()