Order results to make test always pass
Use cached type registry if available