Temporary fix of cache problem