Feature/261

Please see: websharks/quick-cache#261