Revert "Added cache and sweepers"

This reverts commit af45376ccade9e6eb32093d7aee38e66de8b06a5.