fix wrapping objects in DB queries
disable query caching, invalidation not working properly