More fixes, removed static based schema caching