fix class caching issue