Adds fix for the dynamic table creation caching