Fix usage caching issue #244