[fix] Cache also does typeof/null check propers now