added caching. Like a baws
no need for error handler no more.