Bug fix; websharks/quick-cache#184
Bug fix; websharks/quick-cache#185
Merge branch 'feature/184' into feature/188
Bug fix; websharks/quick-cache#188