Merge "Fix crash when creating preview cache table"