Added caching 30 min hard, 24h soft