Fix models (db consistency); Use Ella's CachedForeignKey