fixed a regression caused by new caching system