Moved event organisation into cache
Reverted use of to-month