Quickfix for #89 - might need some extra tweaking though, but this should do for the time being.
Merge pull request #91 from Kunstmaan/fix/liip_caching

Quickfix for #89 - might need some extra tweaking though
Merge branch 'master' into 2.2