Finish fixing bug #3212 (case where the folder exists, but is uncached