additional data cache level, refactoring, fixing calendar