Revert "store api_cache by service as well"

Has been moved to branch, as it is an unfinished somewhat broken
commit. Needs work.

This reverts commit 5d6082910a954da4f0114301ea417d695bf17e86.