Fixes #38/added cache settings