Remove obsolete def
Merge branch 'store-cache' into iow-testing
Fix error with re-find
Merge branch 'store-cache' into iow-testing