Cool, thanks for your feedback.
I do agree that it will be worth moving that cache to a separate class. I'll keep this in mind when I get to optimize the performance of the other storages implementations as well.