More Consumes cleanup, and adding proper reflection caching