Fixed useless cache entry creation for local resources
Removed useless logging
Merge branch 'dev'