Updated on second level cache and event system