Constants updated
Cache implemented