CRM-15140 - tweak cache of GET variable to be more accurate