CON-1130 | cache fix for set()