Remove dangling SQL statement and replace with NonEntityDao class
Code review for cache -- extract dangling sqldao. fix tests,..