FIxes #3761 Regenerate cache file on first cache miss
Merge remote-tracking branch 'origin/master'