fix better cache