Thanks for working on the flaky tests, @gDINESH13! The tool_lookup_cache.invalidate_all_local() addition is the right fix for the tool service test - shared cache state was the real cause of pollution there.

However, I'd suggest a different approach for the assertion relaxations:

1. TTL test: Relaxing to "1 or 2 entries is fine" means when len(bucket) == 2, we skip verifying that expired tokens are cleaned from the index. Issue [BUG][TESTING]: Flaky tests: TTL expiration and tool listing error handling #2521 suggested using time-machine or freezegun to mock time, which would make the test fully deterministic. That's the preferred approach.
2. Tool service test: With the cache invalidation fix in place, the assertion should remain == 2 (not >= 2), since with proper isolation the result is deterministic.

The root causes here are real-time dependency (TTL) and shared state (cache). The cache fix is correct; the TTL test needs time-mocking rather than looser assertions.

Merging this for now, but would welcome a new PR to address the root cause. Thanks!

Thank you for feedback @crivetimihai it sure does makes lot of sense I will raise a new PR later implementing the changes.