Removed some dependencies, not refreshing cache when unnecessary