Some cleaning. Started caching of resolve results