Added AttributeMapper caching to entity.attributes, since anyone who really needs...