am baf93640: Remove static cache of Folders

* commit 'baf93640bfdb8f3a85ad36f90123dcb57dc5c6e9':
  Remove static cache of Folders