Added cached service support