Code cleanup. Shorter header for streaming and enable array caching again.