cleaner fix for cache issue