enable cache, add comments