Fix service restriction caching