TC more refactorings, map is cleared after date change