Fixing cache issue! Finishing refactor of data sources; need to delete entity detail