Issue #1262430 by dawehner, sdboyer: Convert $conditions to use EntityFieldQuery then load by ID from cache