Bugfix, return cachedResultSet when cached