Adds tests for -surface ...,cache and -ocean ...,cache.