Merge pull request #3995 from nxhack/use_NOCACHE