Clarity refactoring, also removed the dict cache