Finished update to api-keys

- Replaced usage of in memory buckets to use storage interface.
- Updated unit tests.