Added object caching, removed unnecessary "Rename" method