Changes merged with Justin's. Caching for events still not operational