Added support for generic cache