Rework apk cache into coalescing caches

[markusthoemmes]

There's nothing inherently wrong with the existing implementation other than that I found it to be unnecessarily complex to read. This reworks it into a generic coalescingCache, which seems to be applicable to the etags cache as-is as well.