Fixed issues with gradle caching