added caching, fixed dinamic years