Code review comments -

Simplify CacheEntry
Move figuring out class name to GeneratorResultExtensions
Cleanup