Revert "Prevent the folder cache from being overwritten."

This reverts commit e596382d79bc4c2ea2938c8a74974666ca0edace.

Bug: 13273  This won't work as-is. It will prevent any folder
changes from sticking. Correct fix shortly.