Speed up main class discovery by caching
temporary change