improve TD Service Caching #91