Bugfix e cache!!!