Fix tests
added cache settings to testrunner
fixed import Flag
added cache settings to example settings
merge with upstream
replaced gargoyle by waffle in readme