Fix cache invalidation to behave properly.

Use `delete-file` rather than simply setting cache to `nil`.  nil is
still a valid cache value which can cause reinitialization to fail.

Fix bug with nil funcall.