Rollback breaking cache changes