Fixed incorrect Hero names
Apply a layer of caching to all properties