Simpliefied caching to just look at should_cache option & expiration to manage caches. Also added body to cache key.