added caching

Signed-off-by: juliusmercons <julius.masanting@orangeandbronze.com>