added support for payload only caching