Hi Luc, btw. do you mind if I also use this branch to add some tests using the TimeStampedCache implementation, or do you want to keep it for yourself? Thomas