diff --git a/OpenMetaverse/AssetCache.cs b/OpenMetaverse/AssetCache.cs
index 65e55560..5eece1b3 100644
--- a/OpenMetaverse/AssetCache.cs
+++ b/OpenMetaverse/AssetCache.cs
@@ -189,9 +189,9 @@ namespace OpenMetaverse
         private string FileName(UUID assetID)
         {
             if (ComputeAssetCacheFilename != null) {
-                return ComputeAssetCacheFilename(Client.Settings.TEXTURE_CACHE_DIR, assetID);
+                return ComputeAssetCacheFilename(Client.Settings.ASSET_CACHE_DIR, assetID);
             }
-            return Client.Settings.TEXTURE_CACHE_DIR + Path.DirectorySeparatorChar + assetID.ToString();
+            return Client.Settings.ASSET_CACHE_DIR + Path.DirectorySeparatorChar + assetID.ToString();
         }
 
         /// <summary>
@@ -211,9 +211,9 @@ namespace OpenMetaverse
             {
                 Logger.DebugLog("Saving " + FileName(assetID) + " to asset cache.", Client);
 
-                if (!Directory.Exists(Client.Settings.TEXTURE_CACHE_DIR))
+                if (!Directory.Exists(Client.Settings.ASSET_CACHE_DIR))
                 {
-                    Directory.CreateDirectory(Client.Settings.TEXTURE_CACHE_DIR);
+                    Directory.CreateDirectory(Client.Settings.ASSET_CACHE_DIR);
                 }
 
                 File.WriteAllBytes(FileName(assetID), assetData);
@@ -265,7 +265,7 @@ namespace OpenMetaverse
         /// </summary>
         public void Clear()
         {
-            string cacheDir = Client.Settings.TEXTURE_CACHE_DIR;
+            string cacheDir = Client.Settings.ASSET_CACHE_DIR;
             if (!Directory.Exists(cacheDir))
             {
                 return;
@@ -290,7 +290,7 @@ namespace OpenMetaverse
         /// </summary>
         public void Prune()
         {
-            string cacheDir = Client.Settings.TEXTURE_CACHE_DIR;
+            string cacheDir = Client.Settings.ASSET_CACHE_DIR;
             if (!Directory.Exists(cacheDir))
             {
                 return;
@@ -301,10 +301,10 @@ namespace OpenMetaverse
 
             long size = GetFileSize(files);
 
-            if (size > Client.Settings.TEXTURE_CACHE_MAX_SIZE)
+            if (size > Client.Settings.ASSET_CACHE_MAX_SIZE)
             {
                 Array.Sort(files, new SortFilesByAccesTimeHelper());
-                long targetSize = (long)(Client.Settings.TEXTURE_CACHE_MAX_SIZE * 0.9);
+                long targetSize = (long)(Client.Settings.ASSET_CACHE_MAX_SIZE * 0.9);
                 int num = 0;
                 foreach (FileInfo file in files)
                 {
@@ -362,7 +362,7 @@ namespace OpenMetaverse
         /// </summary>
         private bool Operational()
         {
-            return Client.Settings.USE_TEXTURE_CACHE;
+            return Client.Settings.USE_ASSET_CACHE;
         }
 
         /// <summary>
diff --git a/OpenMetaverse/Settings.cs b/OpenMetaverse/Settings.cs
index 42f1d2ad..f316a5d3 100644
--- a/OpenMetaverse/Settings.cs
+++ b/OpenMetaverse/Settings.cs
@@ -247,19 +247,19 @@ namespace OpenMetaverse
         public bool ALWAYS_REQUEST_PARCEL_DWELL = true;
 
         #endregion
-        #region Texture Cache
+        #region Asset Cache
 
         /// <summary>
-        /// If true, images downloaded from the server will be cached 
-        /// in a local directory
+        /// If true, images, and other assets downloaded from the server 
+        /// will be cached in a local directory
         /// </summary>
-        public bool USE_TEXTURE_CACHE = true;
+        public bool USE_ASSET_CACHE = true;
 
         /// <summary>Path to store cached texture data</summary>
-        public string TEXTURE_CACHE_DIR = RESOURCE_DIR + "/cache";
+        public string ASSET_CACHE_DIR = RESOURCE_DIR + "/cache";
 
         /// <summary>Maximum size cached files are allowed to take on disk (bytes)</summary>
-        public long TEXTURE_CACHE_MAX_SIZE = 1024 * 1024 * 1024; // 1GB
+        public long ASSET_CACHE_MAX_SIZE = 1024 * 1024 * 1024; // 1GB
 
         #endregion
         #region Misc
diff --git a/Programs/PrimWorkshop/frmBrowser.cs b/Programs/PrimWorkshop/frmBrowser.cs
index db0d648d..b0c2fdce 100644
--- a/Programs/PrimWorkshop/frmBrowser.cs
+++ b/Programs/PrimWorkshop/frmBrowser.cs
@@ -146,8 +146,8 @@ namespace PrimWorkshop
             Client.Settings.ALWAYS_DECODE_OBJECTS = true;
             Client.Settings.ALWAYS_REQUEST_OBJECTS = true;
             Client.Settings.SEND_AGENT_UPDATES = true;
-            Client.Settings.USE_TEXTURE_CACHE = true;
-            //Client.Settings.TEXTURE_CACHE_DIR = Application.StartupPath + System.IO.Path.DirectorySeparatorChar + "cache";
+            Client.Settings.USE_ASSET_CACHE = true;
+            //Client.Settings.ASSET_CACHE_DIR = Application.StartupPath + System.IO.Path.DirectorySeparatorChar + "cache";
             Client.Settings.ALWAYS_REQUEST_PARCEL_ACL = false;
             Client.Settings.ALWAYS_REQUEST_PARCEL_DWELL = false;
             // Crank up the throttle on texture downloads
diff --git a/Programs/examples/Dashboard/Dashboard.cs b/Programs/examples/Dashboard/Dashboard.cs
index c53bc845..b91351d4 100644
--- a/Programs/examples/Dashboard/Dashboard.cs
+++ b/Programs/examples/Dashboard/Dashboard.cs
@@ -61,7 +61,7 @@ namespace Dashboard
             //initialize client object
             Client = new GridClient();
             Client.Settings.USE_LLSD_LOGIN = true;
-            Client.Settings.USE_TEXTURE_CACHE = true;
+            Client.Settings.USE_ASSET_CACHE = true;
 
             Client.Network.OnCurrentSimChanged += new NetworkManager.CurrentSimChangedCallback(Network_OnCurrentSimChanged);
             Client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(Network_OnDisconnected);
diff --git a/Programs/examples/TestClient/TestClient.cs b/Programs/examples/TestClient/TestClient.cs
index c989f550..f72387f6 100644
--- a/Programs/examples/TestClient/TestClient.cs
+++ b/Programs/examples/TestClient/TestClient.cs
@@ -48,7 +48,7 @@ namespace OpenMetaverse.TestClient
             Settings.ALWAYS_DECODE_OBJECTS = true;
             Settings.ALWAYS_REQUEST_OBJECTS = true;
             Settings.SEND_AGENT_UPDATES = true;
-            Settings.USE_TEXTURE_CACHE = true;
+            Settings.USE_ASSET_CACHE = true;
 
             Network.RegisterCallback(PacketType.AgentDataUpdate, new NetworkManager.PacketCallback(AgentDataUpdateHandler));
             Network.OnLogin += new NetworkManager.LoginCallback(LoginHandler);