Removed unused code
Added a way to clear cached data