Added cache and logs