Add caching & expire configuration