diff --git a/Data/Scripts/009_Objects and windows/001_BitmapCache.rb b/Data/Scripts/009_Objects and windows/001_BitmapCache.rb
index 3fc6077d4..3b09d665d 100644
--- a/Data/Scripts/009_Objects and windows/001_BitmapCache.rb	
+++ b/Data/Scripts/009_Objects and windows/001_BitmapCache.rb	
@@ -2,34 +2,35 @@ class Hangup < Exception; end
 
 
 
-def strsplit(str,re)
-  ret=[]
-  tstr=str
-  while re=~tstr
-    ret[ret.length]=$~.pre_match
-    tstr=$~.post_match
+def strsplit(str, re)
+  ret = []
+  tstr = str
+  while re = ~tstr
+    ret[ret.length] = $~.pre_match
+    tstr = $~.post_match
   end
-  ret[ret.length]=tstr if ret.length
+  ret[ret.length] = tstr if ret.length
   return ret
 end
 
 def canonicalize(c)
-  csplit = strsplit(c,/[\/\\]/)
+  csplit = strsplit(c, /[\/\\]/)
   pos = -1
   ret = []
   retstr = ""
   for x in csplit
-    if x=="."
-    elsif x==".."
-      ret.delete_at(pos) if pos>=0
-      pos -= 1
-    else
+    if x == ".."
+      if pos >= 0
+        ret.delete_at(pos)
+        pos -= 1
+      end
+    elsif x != "."
       ret.push(x)
       pos += 1
     end
   end
   for i in 0...ret.length
-    retstr += "/" if i>0
+    retstr += "/" if i > 0
     retstr += ret[i]
   end
   return retstr
@@ -38,6 +39,7 @@ end
 
 
 #####################################################################
+# TODO: Delete this class in Ruby 2+.
 class WeakRef
   @@id_map =  {}
   @@id_rev_map =  {}
@@ -91,6 +93,7 @@ end
 
 
 
+# TODO: Delete this class in Ruby 2+.
 class WeakHashtable
   include Enumerable
 
@@ -123,73 +126,29 @@ class WeakHashtable
   end
 
   def [](key)
-    o=@hash[key]
+    o = @hash[key]
     return o if !o
     if o.weakref_alive?
-      o=o.__getobj__
+      o = o.__getobj__
     else
       @hash.delete(key)
-      o=nil
+      o = nil
     end
     return o
   end
 
-  def []=(key,o)
-    if o!=nil
-      o=WeakRef.new(o)
-    end
-    @hash[key]=o
+  def []=(key, o)
+    o = WeakRef.new(o) if o != nil
+    @hash[key] = o
   end
 end
 
 
 
-# Cache from RPG Maker VX library
-module Cache
-  def self.system(x,hue=0)
-    BitmapCache.load_bitmap("Graphics/System/"+x,hue, true)
-  end
-
-  def self.character(x,hue=0)
-    BitmapCache.load_bitmap("Graphics/Characters/"+x,hue, true)
-  end
-
-  def self.picture(x,hue=0)
-    BitmapCache.load_bitmap("Graphics/Pictures/"+x,hue, true)
-  end
-
-  def self.animation(x,hue=0)
-    BitmapCache.load_bitmap("Graphics/Animations/"+x,hue, true)
-  end
-
-  def self.battler(x,hue=0)
-    BitmapCache.load_bitmap("Graphics/Battlers/"+x,hue, true)
-  end
-
-  def self.face(x,hue=0)
-    BitmapCache.load_bitmap("Graphics/Faces/"+x,hue, true)
-  end
-
-  def self.parallax(x,hue=0)
-    BitmapCache.load_bitmap("Graphics/Parallaxes/"+x,hue, true)
-  end
-
-  def self.clear
-    BitmapCache.clear()
-  end
-
-  def self.load_bitmap(dir,name,hue=0)
-    BitmapCache.load_bitmap(dir+name,hue, true)
-  end
-end
-
-
-
-# RPG::Cache from RPG Maker XP library
 module RPG
   module Cache
     def self.load_bitmap(folder_name, filename, hue = 0)
-	    BitmapCache.load_bitmap(folder_name+filename.to_s,hue, true)
+      BitmapCache.load_bitmap(folder_name + filename.to_s, hue, true)
     end
 
     def self.animation(filename, hue)
@@ -245,7 +204,7 @@ module RPG
     end
 
     def self.tile(filename, tile_id, hue)
-      BitmapCache.tile(filename,tile_id,hue)
+      BitmapCache.tile(filename, tile_id, hue)
     end
 
     def self.clear
@@ -259,53 +218,52 @@ end
 class BitmapWrapper < Bitmap
   attr_reader :refcount
 
-  @@disposedBitmaps={}
-  @@keys={}
-
   def dispose
     return if self.disposed?
-    @refcount-=1
-    super if @refcount==0
+    @refcount -= 1
+    super if @refcount == 0
   end
 
   def initialize(*arg)
     super
-    @refcount=1
+    @refcount = 1
   end
 
   def resetRef
-    @refcount=1
+    @refcount = 1
   end
 
   def copy
-    bm=self.clone
+    bm = self.clone
     bm.resetRef
     return bm
   end
 
   def addRef
-    @refcount+=1
+    @refcount += 1
   end
 end
 
 
 
 module BitmapCache
+  # TODO: Replace this with the commented line in Ruby 2+.
   @cache = WeakHashtable.new
+#  @cache = ObjectSpace::WeakMap.new
 
   def self.fromCache(i)
     return nil if !@cache.include?(i)
-    obj=@cache[i]
+    obj = @cache[i]
     return nil if obj && obj.disposed?
     return obj
   end
 
-  def self.setKey(key,obj)
-    @cache[key]=obj
+  def self.setKey(key, obj)
+    @cache[key] = obj
   end
 
   def self.debug
-    File.open("bitmapcache2.txt","wb") { |f|
+    File.open("bitmapcache2.txt", "wb") { |f|
       for i in @cache.keys
         k = fromCache(i)
         if !k
@@ -321,31 +279,33 @@ module BitmapCache
 
   def self.load_bitmap(path, hue = 0, failsafe = false)
     cached = true
-    path = canonicalize(path)
+    path = -canonicalize(path)   # Creates a frozen string from the path, to ensure identical paths are treated as identical.
     objPath = fromCache(path)
     if !objPath
-      @cleancounter = ((@cleancounter || 0) + 1)%10
+      # TODO: Delete this in Ruby 2+.
+      @cleancounter = ((@cleancounter || 0) + 1) % 10
       if @cleancounter == 0
         for i in @cache.keys
           @cache.delete(i) if !fromCache(i)
         end
       end
+      # TODO: Up to here.
       begin
         bm = BitmapWrapper.new(path)
       rescue Hangup
         begin
           bm = BitmapWrapper.new(path)
         rescue
-          raise _INTL("Failed to load the bitmap located at: {1}",path) if !failsafe
-          bm = BitmapWrapper.new(32,32)
+          raise _INTL("Failed to load the bitmap located at: {1}", path) if !failsafe
+          bm = BitmapWrapper.new(32, 32)
         end
       rescue
-        raise _INTL("Failed to load the bitmap located at: {1}",path) if !failsafe
-        bm = BitmapWrapper.new(32,32)
+        raise _INTL("Failed to load the bitmap located at: {1}", path) if !failsafe
+        bm = BitmapWrapper.new(32, 32)
       end
       objPath = bm
       @cache[path] = objPath
-      cached=false
+      cached = false
     end
     if hue == 0
       objPath.addRef if cached
@@ -355,7 +315,7 @@ module BitmapCache
       objKey = fromCache(key)
       if !objKey
         bitmap = objPath.copy
-        bitmap.hue_change(hue) if hue!=0
+        bitmap.hue_change(hue) if hue != 0
         objKey = bitmap
         @cache[key] = objKey
       else
@@ -366,71 +326,71 @@ module BitmapCache
   end
 
   def self.animation(filename, hue)
-    self.load_bitmap("Graphics/Animations/"+filename, hue)
+    self.load_bitmap("Graphics/Animations/" + filename, hue)
   end
 
   def self.autotile(filename)
-    self.load_bitmap("Graphics/Autotiles/"+ filename)
+    self.load_bitmap("Graphics/Autotiles/" + filename)
   end
 
   def self.battleback(filename)
-    self.load_bitmap("Graphics/Battlebacks/"+ filename)
+    self.load_bitmap("Graphics/Battlebacks/" + filename)
   end
 
   def self.battler(filename, hue)
-    self.load_bitmap("Graphics/Battlers/"+ filename, hue)
+    self.load_bitmap("Graphics/Battlers/" + filename, hue)
   end
 
   def self.character(filename, hue)
-    self.load_bitmap("Graphics/Characters/"+ filename, hue)
+    self.load_bitmap("Graphics/Characters/" + filename, hue)
   end
 
   def self.fog(filename, hue)
-    self.load_bitmap("Graphics/Fogs/"+ filename, hue)
+    self.load_bitmap("Graphics/Fogs/" + filename, hue)
   end
 
   def self.gameover(filename)
-    self.load_bitmap("Graphics/Gameovers/"+ filename)
+    self.load_bitmap("Graphics/Gameovers/" + filename)
   end
 
   def self.icon(filename)
-    self.load_bitmap("Graphics/Icons/"+ filename)
+    self.load_bitmap("Graphics/Icons/" + filename)
   end
 
   def self.panorama(filename, hue)
-    self.load_bitmap("Graphics/Panoramas/"+ filename, hue)
+    self.load_bitmap("Graphics/Panoramas/" + filename, hue)
   end
 
   def self.picture(filename)
-    self.load_bitmap("Graphics/Pictures/"+ filename)
+    self.load_bitmap("Graphics/Pictures/" + filename)
   end
 
   def self.tileset(filename)
-    self.load_bitmap("Graphics/Tilesets/"+ filename)
+    self.load_bitmap("Graphics/Tilesets/" + filename)
   end
 
   def self.title(filename)
-    self.load_bitmap("Graphics/Titles/"+ filename)
+    self.load_bitmap("Graphics/Titles/" + filename)
   end
 
   def self.windowskin(filename)
-    self.load_bitmap("Graphics/Windowskins/"+ filename)
+    self.load_bitmap("Graphics/Windowskins/" + filename)
   end
 
   def self.tileEx(filename, tile_id, hue)
     key = [filename, tile_id, hue]
-    objKey=fromCache(key)
+    objKey = fromCache(key)
     if !objKey
-      bitmap=BitmapWrapper.new(32, 32)
+      bitmap = BitmapWrapper.new(Game_Map::TILE_WIDTH, Game_Map::TILE_HEIGHT)
       x = (tile_id - 384) % 8 * 32
       y = (tile_id - 384) / 8 * 32
-      rect = Rect.new(x, y, 32, 32)
+      rect = Rect.new(x, y, Game_Map::TILE_WIDTH, Game_Map::TILE_HEIGHT)
       tileset = yield(filename)
       bitmap.blt(0, 0, tileset, rect)
       tileset.dispose
-      bitmap.hue_change(hue) if hue!=0
-      objKey=bitmap
-      @cache[key]=objKey
+      bitmap.hue_change(hue) if hue != 0
+      objKey = bitmap
+      @cache[key] = objKey
     else
       objKey.addRef
     end
@@ -438,11 +398,13 @@ module BitmapCache
   end
 
   def self.tile(filename, tile_id, hue)
-    return self.tileEx(filename, tile_id,hue) { |f| self.tileset(f) }
+    return self.tileEx(filename, tile_id, hue) { |f| self.tileset(f) }
   end
 
   def self.clear
-    @cache = {}
+    # TODO: Replace this with the commented line in Ruby 2+.
+    @cache.clear
+#    @cache = ObjectSpace::WeakMap.new
     GC.start
   end
 end