Syntax.
Removed old tests.
Simplified caching of generic SQL.