Let get_cached_by_source also return the cache_key.
Reflect last API changes in client.