diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 19afe97781..2da653dae6 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -254,18 +254,16 @@ namespace OpenSim.Region.ClientStack.Linden
                         }
                     }
 
-
-
                     p.Appearance.WearableCacheItems = cacheItems;
-                    
-                   
-
+                  
                     if (m_BakedTextureModule != null)
                     {
                         m_BakedTextureModule.Store(remoteClient.AgentId, cacheItems);
                         p.Appearance.WearableCacheItemsDirty = true;
                         
                     }
+                    else
+                        p.Appearance.WearableCacheItemsDirty = false;
                 }
             }
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 0e8c7caa37..08b6cb4bdd 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -12037,19 +12037,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 ScenePresence p = m_scene.GetScenePresence(AgentId);
                 if (p.Appearance != null)
                 {
-                    if (p.Appearance.WearableCacheItems == null)
+                    if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty)
                     {
                         if (bakedTextureModule != null)
                         {
                             m_log.Debug("[ HandleAgentTextureCached] bakedTextureModule");
                             try
                             {
-                                if (p.Appearance.WearableCacheItemsDirty)
-                                {
-                                    cacheItems = bakedTextureModule.Get(AgentId);
-                                    p.Appearance.WearableCacheItems = cacheItems;
-                                    p.Appearance.WearableCacheItemsDirty = false;
-                                }
+                                cacheItems = bakedTextureModule.Get(AgentId);
+                                p.Appearance.WearableCacheItems = cacheItems;
+                                p.Appearance.WearableCacheItemsDirty = false;
                             }
 
                             /*
@@ -12074,7 +12071,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
                     }
 
-                    if (p.Appearance.WearableCacheItems != null)
+                    else if (p.Appearance.WearableCacheItems != null)
                     {
                         cacheItems = p.Appearance.WearableCacheItems;
                     }