Merge "Inject cache as constructor param of SiteSQLStore"