More NHibernate cache fixes