Additional performance tuning, caching result type and return type hierarchy calculation 50% gain