fix cache and service