Removed deprecated cache() calls