Improve caching table: