fix bug - when the entity ID is not specified there should not be any
data
Revert "fix bug - when the entity ID is not specified there should not be any"

This reverts commit e4fee7166e65108933732feb2733595ec23da764.
add cache
Merge pull request #71 from kimyen/develop

Add cache