add cache, and rename tables