Remove lazy caching (KISS), add ext option