Fixed cached system crash and minor updates