Remove old test and add cache cleaner