simplify (and fix) caching logic

Signed-off-by: David Varvel <dvarvel@pivotallabs.com>