Moved some components to use caching table