Before no_cache=1 fix