Couple of minor clean-up
(renaming PeriodicEventHandler and removing controllerCache)