cleanup in data structure
updating cache