Fix several broken equals comparators
Implement armor caching and deprecate uncached methods