Use cached variables instead of options