Adding caching for policies