more CachingState, fixed runtime of TestClient