Improve caching, do not compose anonymous Types.