diff --git a/Data/Scripts/003_Game processing/002_Scene_Map.rb b/Data/Scripts/003_Game processing/002_Scene_Map.rb
index a71757e25..c68ba4413 100644
--- a/Data/Scripts/003_Game processing/002_Scene_Map.rb	
+++ b/Data/Scripts/003_Game processing/002_Scene_Map.rb	
@@ -8,7 +8,7 @@ class Scene_Map
 
   def spriteset
     for i in @spritesets.values
-      return i if i.map==$game_map
+      return i if i.map == $game_map
     end
     return @spritesets.values[0]
   end
@@ -51,43 +51,48 @@ class Scene_Map
     map = load_data(sprintf("Data/Map%03d.rxdata", mapid))
     if playingBGM && map.autoplay_bgm
       if (PBDayNight.isNight? rescue false)
-        pbBGMFade(0.8) if playingBGM.name!=map.bgm.name && playingBGM.name!=map.bgm.name+"_n"
+        pbBGMFade(0.8) if playingBGM.name != map.bgm.name && playingBGM.name != map.bgm.name + "_n"
       else
-        pbBGMFade(0.8) if playingBGM.name!=map.bgm.name
+        pbBGMFade(0.8) if playingBGM.name != map.bgm.name
       end
     end
     if playingBGS && map.autoplay_bgs
-      pbBGMFade(0.8) if playingBGS.name!=map.bgs.name
+      pbBGMFade(0.8) if playingBGS.name != map.bgs.name
     end
     Graphics.frame_reset
   end
 
   #todo
   def cacheNeedsClearing
-    return false
+    p RPG::Cache.size
+    return RPG::Cache.size >= 100
   end
 
-  def transfer_player(cancelVehicles=true)
+  def transfer_player(cancelVehicles = true)
     $game_temp.player_transferring = false
     pbCancelVehicles($game_temp.player_new_map_id) if cancelVehicles
     autofade($game_temp.player_new_map_id)
     pbBridgeOff
     @spritesetGlobal.playersprite.clearShadows
-    if $game_map.map_id!=$game_temp.player_new_map_id
+    if $game_map.map_id != $game_temp.player_new_map_id
       $MapFactory.setup($game_temp.player_new_map_id)
     end
     $game_player.moveto($game_temp.player_new_x, $game_temp.player_new_y)
     case $game_temp.player_new_direction
-    when 2 then $game_player.turn_down
-    when 4 then $game_player.turn_left
-    when 6 then $game_player.turn_right
-    when 8 then $game_player.turn_up
+    when 2 then
+      $game_player.turn_down
+    when 4 then
+      $game_player.turn_left
+    when 6 then
+      $game_player.turn_right
+    when 8 then
+      $game_player.turn_up
     end
 
     $game_player.straighten
     $game_map.update
     disposeSpritesets
-    if cacheNeedsClearing()
+    if RPG::Cache.need_clearing
       RPG::Cache.clear
     end
     createSpritesets
@@ -217,7 +222,7 @@ class Scene_Map
     end
   end
 
-  def reset_map(fadeout=false)
+  def reset_map(fadeout = false)
     $MapFactory.setup($game_map.map_id)
     $game_player.moveto($game_player.x, $game_player.y)
     $game_player.straighten
diff --git a/Data/Scripts/007_Objects and windows/001_RPG_Cache.rb b/Data/Scripts/007_Objects and windows/001_RPG_Cache.rb
index fd0304fd7..1d49e8f72 100644
--- a/Data/Scripts/007_Objects and windows/001_RPG_Cache.rb	
+++ b/Data/Scripts/007_Objects and windows/001_RPG_Cache.rb	
@@ -31,6 +31,9 @@ module RPG
       return obj
     end
 
+    def self.need_clearing()
+      return @cache.size >= 100
+    end
 
 
     def self.load_bitmap(folder_name, filename, hue = 0)
diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb b/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb
index f56cf002e..43ab8a88d 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb	
@@ -3,7 +3,9 @@
 #===============================================================================
 def pbSceneStandby
   $scene.disposeSpritesets if $scene && $scene.is_a?(Scene_Map)
-  RPG::Cache.clear
+  if RPG::Cache.need_clearing
+    RPG::Cache.clear
+  end
   Graphics.frame_reset
   yield
   $scene.createSpritesets if $scene && $scene.is_a?(Scene_Map)