diff --git a/public/avatars/Test Avaturn.glb b/public/avatars/Test_Avaturn.glb
similarity index 100%
rename from public/avatars/Test Avaturn.glb
rename to public/avatars/Test_Avaturn.glb
diff --git a/public/avatars/Test RPM.glb b/public/avatars/Test_RPM.glb
similarity index 100%
rename from public/avatars/Test RPM.glb
rename to public/avatars/Test_RPM.glb
diff --git a/resources.json b/resources.json
index 0a8c4fb..d34a99e 100644
--- a/resources.json
+++ b/resources.json
@@ -22,7 +22,7 @@
     ],
     "dependencies": [],
     "name": "Racer-transformed.gltf",
-    "thumbnailKey": "https://172.27.136.37:8642/projects/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_Racer-transformed.gltf-thumbnail.png",
+    "thumbnailKey": "__$project$__/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_Racer-transformed.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/animations/Racer/740e60973cb1cb9852ebe8821bcaf77f2fda66b68f5ed2c143ef504087968238.bin": {
@@ -72,7 +72,7 @@
     ],
     "dependencies": [],
     "name": "rings.glb",
-    "thumbnailKey": "https://172.27.136.37:8642/projects/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_rings.glb-thumbnail.png",
+    "thumbnailKey": "__$project$__/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_rings.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/animations/tornado-mobile-xr.glb": {
@@ -82,7 +82,7 @@
     ],
     "dependencies": [],
     "name": "tornado-mobile-xr.glb",
-    "thumbnailKey": "https://172.27.136.37:8642/projects/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_tornado-mobile-xr.glb-thumbnail.png",
+    "thumbnailKey": "__$project$__/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_tornado-mobile-xr.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/animations/transforms.glb": {
@@ -92,7 +92,7 @@
     ],
     "dependencies": [],
     "name": "transforms.glb",
-    "thumbnailKey": "https://172.27.136.37:8642/projects/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_transforms.glb-thumbnail.png",
+    "thumbnailKey": "__$project$__/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_transforms.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/envmaps/hall.glb": {
@@ -640,7 +640,7 @@
     "name": "HDVideo.mp4"
   },
   "public/avatars/Adam.gltf": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -722,7 +722,7 @@
     "name": "female_01.png"
   },
   "public/avatars/female_01.vrm": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -740,7 +740,7 @@
     "name": "female_02.png"
   },
   "public/avatars/female_02.vrm": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -758,7 +758,7 @@
     "name": "female_03.png"
   },
   "public/avatars/female_03.vrm": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -776,7 +776,7 @@
     "name": "female_04.png"
   },
   "public/avatars/female_04.vrm": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -794,7 +794,7 @@
     "name": "female_05.png"
   },
   "public/avatars/female_05.vrm": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -812,7 +812,7 @@
     "name": "female_06.png"
   },
   "public/avatars/female_06.vrm": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -830,7 +830,7 @@
     "name": "male_01.png"
   },
   "public/avatars/male_01.vrm": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -848,7 +848,7 @@
     "name": "male_02.png"
   },
   "public/avatars/male_02.vrm": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -866,7 +866,7 @@
     "name": "male_03.png"
   },
   "public/avatars/male_03.vrm": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -884,7 +884,7 @@
     "name": "male_04.png"
   },
   "public/avatars/male_04.vrm": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -893,21 +893,21 @@
     ],
     "name": "male_04.vrm"
   },
-  "public/avatars/Test Avaturn.glb": {
-    "type": "asset",
+  "public/avatars/Test_Avaturn.glb": {
+    "type": "avatar",
     "tags": [
       "Model"
     ],
     "dependencies": [],
-    "name": "Test Avaturn.glb"
+    "name": "Test_Avaturn.glb"
   },
-  "public/avatars/Test RPM.glb": {
-    "type": "asset",
+  "public/avatars/Test_RPM.glb": {
+    "type": "avatar",
     "tags": [
       "Model"
     ],
     "dependencies": [],
-    "name": "Test RPM.glb"
+    "name": "Test_RPM.glb"
   },
   "public/scenes/animations-test.envmap.ktx2": {
     "type": "asset",
diff --git a/src/examples/WebXR.tsx b/src/examples/WebXR.tsx
deleted file mode 100644
index 5a572a2..0000000
--- a/src/examples/WebXR.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { MediaIconsBox } from '@ir-engine/client-core/src/components/MediaIconsBox'
-import { XRLoading } from '@ir-engine/client-core/src/components/XRLoading'
-import { Engine, EntityTreeComponent, setComponent } from '@ir-engine/ecs'
-import { loadEmptyScene } from '@ir-engine/engine/tests/util/loadEmptyScene'
-import { getMutableState } from '@ir-engine/hyperflux'
-import { CameraOrbitComponent } from '@ir-engine/spatial/src/camera/components/CameraOrbitComponent'
-import { RendererState } from '@ir-engine/spatial/src/renderer/RendererState'
-import { BackgroundComponent } from '@ir-engine/spatial/src/renderer/components/SceneComponents'
-import React, { useEffect } from 'react'
-import { Color } from 'three'
-
-export default function WebXR() {
-  useEffect(() => {
-    getMutableState(RendererState).gridVisibility.set(true)
-    const sceneEntity = loadEmptyScene()!
-    setComponent(sceneEntity, EntityTreeComponent, { parentEntity: Engine.instance.originEntity })
-    setComponent(sceneEntity, BackgroundComponent, new Color('black'))
-    setComponent(Engine.instance.viewerEntity, CameraOrbitComponent)
-  }, [])
-
-  return (
-    <>
-      <div style={{ pointerEvents: 'all' }}>
-        <XRLoading />
-        <MediaIconsBox />
-      </div>
-    </>
-  )
-}
diff --git a/src/examples/multipleScenes.tsx b/src/examples/multipleScenes.tsx
index 4a05e16..4de2c47 100644
--- a/src/examples/multipleScenes.tsx
+++ b/src/examples/multipleScenes.tsx
@@ -46,7 +46,7 @@ import {
 } from '@ir-engine/spatial/src/renderer/materials/MaterialComponent'
 import { computeTransformMatrix } from '@ir-engine/spatial/src/transform/systems/TransformSystem'
 import React, { useEffect } from 'react'
-import { Cache, Color, Euler, MathUtils, Matrix4, MeshLambertMaterial, Quaternion, Vector3 } from 'three'
+import { Color, Euler, MathUtils, Matrix4, MeshLambertMaterial, Quaternion, Vector3 } from 'three'
 import { Transform } from './utils/transform'
 
 export const TestSuiteBallTagComponent = defineComponent({ name: 'TestSuiteBallTagComponent' })
@@ -162,10 +162,8 @@ const SceneReactor = (props: { coord: Vector3 }) => {
     const sceneID = `scene-${coord.x}-${coord.z}`
     const gltf = createSceneGLTF(sceneID)
 
-    const sceneURL = `/${sceneID}.gltf`
-
-    Cache.enabled = true
-    Cache.add(sceneURL, gltf)
+    const blob = new Blob([JSON.stringify(gltf)], { type: 'application/json' })
+    const sceneURL = URL.createObjectURL(blob)
 
     const gltfEntity = AssetState.load(sceneURL, sceneURL as EntityUUID, Engine.instance.originEntity)
     getMutableComponent(Engine.instance.viewerEntity, RendererComponent).scenes.merge([gltfEntity])