Updated task to remove old cache strings. Add tests
Updated task to remove old cache strings. Add tests
Merge conflicts