Work on unit caching again.
Kill some prints