refactor, and merging changes instead of clearing caches