some updates to models and caching