Apply event cache fix back.

DCO-1.1-Signed-Off-By: Kunmyon Choi kunmyon.choi@lge.com