Fix test case
Update some unit tests
Use soft cache for analysis cache