Finally found a fix for cache problem