Added cache and includes