Add non-null checks to table & column names
Add timeout to cache