Testing tweaks
Re-enabled further pre-cache-test