merged changes for transactional caches into master