NPE fix introduced another issue, this fixes both

Conflicts:
	src/main/java/org/dasein/cloud/vcloud/vCloudMethod.java
Merge pull request #17 from timf/caching-recursion-issue-develop

NPE fix introduced another issue, this fixes both