Feature/130-151-169

Please see details here: https://github.com/websharks/quick-cache/issues/169