Improved caching and added an additional cache option.

Removed prepro_nocache module.
Code cleanup.