Cleaning in Foutain and Cache WIP