diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index 7713ce07ee..1c78eceaaf 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -9,7 +9,7 @@ PREP_RECOMPILE_END;
 
 GVAR(syncedEvents) = [] call CBA_fnc_hashCreate;
 GVAR(showHudHash) = [] call CBA_fnc_hashCreate;
-GVAR(vehicleIconCache) = call CBA_fnc_createNamespace; // for getVehicleIcon
+GVAR(vehicleIconCache) = createHashMap; // for getVehicleIcon
 
 GVAR(settingsInitFinished) = false;
 GVAR(runAtSettingsInitialized) = [];
diff --git a/addons/common/functions/fnc_getVehicleIcon.sqf b/addons/common/functions/fnc_getVehicleIcon.sqf
index ce17a66bc2..3c3e4aa727 100644
--- a/addons/common/functions/fnc_getVehicleIcon.sqf
+++ b/addons/common/functions/fnc_getVehicleIcon.sqf
@@ -25,7 +25,7 @@ private _objectType = if (_object isEqualType objNull) then {
 } else {
     _object
 };
-private _cachedValue = GVAR(vehicleIconCache) getVariable _objectType;
+private _cachedValue = GVAR(vehicleIconCache) get _objectType;
 
 if (isNil "_cachedValue") then {
     private _vehicleValue = getText (configfile >> "CfgVehicles" >> _objectType >> "icon");
@@ -41,7 +41,7 @@ if (isNil "_cachedValue") then {
         _cachedValue = _vehicleIconValue;
     };
 
-    GVAR(vehicleIconCache) setVariable [_objectType, _cachedValue];
+    GVAR(vehicleIconCache) set [_objectType, _cachedValue];
 };
 
 _cachedValue