Re-implemented the cache system, old one failed, and moved the method to EtaCache. This naturally led to a refactoring of Api.