Feature/182

Please see: websharks/quick-cache#182