Removed old unit caching system