CON-2230 Use cached variables