Updated schema; database caching basically functional