Feature/260

Please see websharks/quick-cache#260