Re-enable the original cache enabled check