Fix cache storage selection in case of zone scope id passed is null.