fixes #38/added cache settings