Fixed clean cache
Merging changes