Cache feature is back, not entirely stable yet