Fix cache recycle & Upgrade gradle