Better caching, expiration times to be choosen wiser