CR changes: used cached variable