I'll merge this as is now, I'm reworking the cache layer anyway so we can change that later, thanks!