Add cache class

Change-Id: I918cac8db885dc7a0c51ccbef44c3a69602d0857