support restrict entities via options
fix get cached entity when no cached version exists
Merge branch 'restrict-entities'