Cache types and removed unused reference.