Merge branch 'faster-ts-cost-model-test' into 'master'

Improve the performance of test_cost_model_correctness() by caching

See merge request !175